1
0
Переглянути джерело

[changed] Renamed gdkin to pav_disco and added more social group reactions from nutluck

Kevin_Smarts 2 роки тому
батько
коміт
de5a3d9067

+ 1 - 1
glife.qproj

@@ -684,7 +684,7 @@
 		<Location name="pav_commcenter"/>
 		<Location name="pav_commclubs"/>
 		<Location name="pav_library"/>
-		<Location name="gdkin"/>
+		<Location name="pav_disco"/>
 		<Location name="gdksport"/>
 		<Location name="gdktoilet"/>
 		<Location name="gdktoilet_mens"/>

+ 2 - 2
locations/BMloc.qsrc

@@ -3,7 +3,7 @@
 menu_off = 1
 gs 'stat'
 
-act 'Leave':gt 'gdkin'
+act 'Leave':gt 'pav_disco'
 act 'Dance':
 	*clr & cla
 	gs 'stat'
@@ -39,7 +39,7 @@ act 'Dance':
 			gs 'willpower', 'drink', 'resist'
 			gs 'willpower', 'pay'
 			gs 'stat'
-			gt 'gdkin'
+			gt 'pav_disco'
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 4 - 4
locations/FedorMisc.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'Fedor Chat':
 	if npc_rel['A5'] >= 60 and npc_rel['A5'] < 80:'You and Fedor have a good relationship.'
 	if npc_rel['A5'] >= 80:'You and Fedor have a great relationship.'
 
-	if $loc ! 'gdkin':
+	if $loc ! 'pav_disco':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away': gt $loc, $loc_arg
@@ -76,7 +76,7 @@ if $ARGS[0] = 'Fedor Chat':
 		*clr & cla
 		npc_rel['A5'] += rand(5,10)
 		numnpc = 5
-		if $loc = 'gdkin':minut += 5
+		if $loc = 'pav_disco':minut += 5
 		gs 'stat'
 		if fedorKozlovQW = -10:
 			'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></center>'
@@ -99,7 +99,7 @@ if $ARGS[0] = 'Fedor Chat':
 			'You chat with Fedor, sharing multiple stories as Fedor happily listens while sharing several new stories of his own.'
 		end
 
-		if $loc ! 'gdkin':
+		if $loc ! 'pav_disco':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		else
 			act 'Move away': gt $loc, $loc_arg
@@ -137,7 +137,7 @@ if $ARGS[0] = 'Fedor Hate':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
 	'Fedor looks at you with hatred as he says, "I have nothing to say to you. Go away!"'
 
-	if $loc ! 'gdkin':
+	if $loc ! 'pav_disco':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away': gt $loc, $loc_arg

+ 5 - 5
locations/Gnpc2.qsrc

@@ -272,7 +272,7 @@ $din_gboy_go_to_disco = {
 					gs 'stat'
 					'The Gopnik takes one look at you and then starts laughing, "Listen, buddy. Why are you wasting your time dancing with her? <<$pcs_nickname>> is a <<$gnikname>>. Just take her into the bushes out back, but don''t hurt her mouth. That sweet set of lips can really smack when sucking dick." You blush scarlet red from the Gopnik''s words, deeply embarrassed. <<$boydesc>> rushes up to the guy, "What did you say? Come again!" But the hooligan just went back to join his friends. "Listen, boy, no need to argue. Everyone in the neighborhood knows she is a <<$gnikname>>." <<$boydesc>> looks at you in surprise. "Is this true?" The boys laugh "Well, everyone except you." <<$boydesc>> glares angrily at you and then he slaps you hard across the face. "Go fuck yourself, slut!" He abruptly leaves the dance floor.'
 
-					act 'Rub your cheek':gt 'gdkin'
+					act 'Rub your cheek':gt 'pav_disco'
 				end
 			elseif diskoIvTiperand = 1:
 				'You enjoy dancing with your <<$bfTitle[numnpc]>>. After a while <<$boydesc>> says that he could do with a beer and invites you to a drink.'
@@ -301,7 +301,7 @@ $din_gboy_go_to_disco = {
 									otnBoyFrend[numnpc] = 0
 									gs 'stat'
 									*pl $bfBreakup
-									act 'Watch him leave':gt 'gdkin'
+									act 'Watch him leave':gt 'pav_disco'
 								end
 							else
 								act 'Tell him to piss off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -322,7 +322,7 @@ $din_gboy_go_to_disco = {
 										otnBoyFrend[numnpc] = 0
 										gs 'stat'
 										*pl $bfBreakup
-										act 'Watch him leave':gt 'gdkin'
+										act 'Watch him leave':gt 'pav_disco'
 									end
 								else
 									act 'Tell him to piss off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -406,7 +406,7 @@ $din_gboy_go_to_disco = {
 											*nl
 											'You angrily spit at him, "Go fuck yourself, asshole!", and storm out of the restroom. Just as you reach the dance floor you see that <<$boydesc>> is returning from the bar. You quickly grab his hands and begin dancing with him, still a little furious about the incident.'
 											'<<$boydesc>> notices your bad mood and asks, "What''s wrong, <<$pcs_nickname>>?". At this moment, you see the guy from the restrooms returning. He walks up to your <<$bfTitle[numnpc]>> and pulls him to the side. After a while, <<$boydesc>> returns and says "We''re through. Based on the shit I was just told, I won''t waste another minute on the likes of a whore like you!"'
-											act 'Watch him leave':gt 'gdkin'
+											act 'Watch him leave':gt 'pav_disco'
 										end
 									else
 										act 'Change your mind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -423,7 +423,7 @@ $din_gboy_go_to_disco = {
 								pcs_mood -= 10
 								gs 'stat'
 								'You start to dance with him. A few minutes later <<$boydesc>> comes up to you and pulls you by the hand, dragging you away from the other guy. "What the fuck is wrong with you? I leave for a minute, and you''re already dancing with someone else!" He angrily leaves the club.'
-								act 'Stand there and watch him leave':gt 'gdkin'
+								act 'Stand there and watch him leave':gt 'pav_disco'
 							end
 
 							gs 'willpower', 'misc', 'resist', 'easy'

+ 2 - 2
locations/IvanEv.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'School Chat':
 	if npc_rel['A3'] >= 60 and npc_rel['A3'] < 80:'You and Ivan have a good relationship.'
 	if npc_rel['A3'] >= 80:'You and Ivan have a great relationship.'
 
-	if $loc ! 'gdkin':
+	if $loc ! 'pav_disco':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away': gt $loc, $loc_arg
@@ -128,7 +128,7 @@ if $ARGS[0] = 'School Chat':
 	
 	act 'Chat':
 		cla
-		if $loc ! 'gdkin':
+		if $loc ! 'pav_disco':
 			if fame['pav_slut'] <= 100 and IvanShowerQW = 1:
 				gs 'nogorslut'
 

+ 1 - 1
locations/KatjaHomeTalk.qsrc

@@ -274,7 +274,7 @@ if $ARGS[0] = '':
 		elseif hour >= 20 and week >= 5 and week < 7:
 			'Katja says, "Let''s go to the disco."'
 
-			if money >= 25:act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'
+			if money >= 25:act 'Go to the disco':money -= 25 & minut += 15 & gt 'pav_disco'
 		end
 	end
 

+ 5 - 5
locations/Katja_Tanga.qsrc

@@ -90,9 +90,9 @@ if $ARGS[0] = 'start':
 	'You did a quick turn, causing your skirt to twirl up. For a brief moment exposing your lack of panties. Katja''s eyes widened in surprise. "You''re not wearing panties?" She whispers to you.'
 	act 'Show her you are not wearing panties.':
 		*clr & cla
-		if $loc ! 'gdkin':
+		if $loc ! 'pav_disco':
 			gt 'Katja_Tanga', 'school'
-		elseif $loc = 'gdkin':
+		elseif $loc = 'pav_disco':
 			gt 'Katja_Tanga', 'dance'
 		end
 	end
@@ -272,7 +272,7 @@ if $ARGS[0] = 'dance':
 						gs 'arousal', 'end'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco6_2.jpg"></center>'
 						'Laughing, you pull aside your dress and reveal one of your bare breasts. Katja looks at you wanting more. "I showed you both of mine." You smile and reply, "Yeah, but you''re wearing panties and I''m not."'
-						act 'Move away': gt'gdkin'
+						act 'Move away': gt'pav_disco'
 					end
 				end
 				act 'Tease her':
@@ -281,7 +281,7 @@ if $ARGS[0] = 'dance':
 					gs 'arousal', 'end'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco6_3.jpg"></center>'
 					'You pull at the edge of your dress, exposing just a bit of one of your nipples. Katja indignant squeaks."Hey I showed you mine.",	You responded with a laugh "I already showed you my pussy, so that makes us even."'
-					act 'Move away': gt'gdkin'
+					act 'Move away': gt'pav_disco'
 				end
 			else
 				gs 'arousal', 'end'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'dance':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco7_<<i>>.jpg"></center>'
 			'Katja does not hesitate and lifts the hem of her skirt, showing you her bare pussy.'
 		end
-		act 'Move away': gt'gdkin'
+		act 'Move away': gt'pav_disco'
 	end
 end
 

+ 1 - 1
locations/NikoDates.qsrc

@@ -1369,7 +1369,7 @@ if $ARGS[0] = 'Disco':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'
 			'Niko shrugs as he responds, "Too bad, I really wanted to spend some time with you today, but if you have something important to do then I won''t keep you from it." You give Niko a kiss on the cheek then say, "Maybe some other time we could drink together." Niko replies, "I would like that. Goodbye for now." You wave at Niko as you walk away.'
 
-			act 'Move away':gt 'gdkin'
+			act 'Move away':gt 'pav_disco'
 		end
 	else
 		act 'I really need to go (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 11 - 11
locations/NikoEv.qsrc

@@ -480,7 +480,7 @@ if $ARGS[0] = 'Disco Intro':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/upset.jpg"></center>'
 	'You approach Niko and immediately notice that he is passed out. He must have have a lot to drink today.'
 	
-	act 'Walk away':gt 'gdkin'
+	act 'Walk away':gt 'pav_disco'
 end
 
 if $ARGS[0] = 'Disco Chat':
@@ -528,7 +528,7 @@ if $ARGS[0] = 'Disco Chat':
 			'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_2_2.mp4"></video></center>'
 			'"I would love to." Niko opens up a bottle of alcohol then hands you the bottle as he gives you a wink. You both spend the next few minutes drinking and sharing stories.'		
 			
-			act 'Get up':gt 'gdkin'
+			act 'Get up':gt 'pav_disco'
 		end	
 	end	
 	
@@ -543,7 +543,7 @@ if $ARGS[0] = 'Disco Chat':
 			'<center><video autoplay loop <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/disco/dance'+rand(1,2)+'.mp4"></video></center>'
 			'"I would love to." Niko takes your hand then leads you to the dance floor where you both spend the next few minutes, dancing together.'		
 			
-			act 'Finish dancing':gt 'gdkin'
+			act 'Finish dancing':gt 'pav_disco'
 		end	
 	end	
 	
@@ -557,7 +557,7 @@ if $ARGS[0] = 'Disco Chat':
 			'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff2.jpg"></center>'
 			'You lift up your hands then extend your middle fingers on each hand, "I only drink with men, not boys." Niko shakes his head as he responds. "Aww, you''re no fun." You turn around then walk toward the dance floor.'
 			
-			act 'Walk away':gt 'gdkin'
+			act 'Walk away':gt 'pav_disco'
 		end	
 	end	
 	
@@ -572,7 +572,7 @@ if $ARGS[0] = 'Disco Chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
 			'"I have your money right here." You extend your hand, giving Niko (200 <b>₽</b>). Niko quickly counts it then gives you an approving nod, "it''s all here. Good, you''re all payed up for today, you can get going now."'	
 			
-			act 'Walk away':gt 'gdkin'
+			act 'Walk away':gt 'pav_disco'
 		end
 		
 		act 'Sex':	
@@ -632,11 +632,11 @@ if $ARGS[0] = 'Disco Chat':
 				'You walk away without saying a word, thinking to yourself. "Something about that guy, really annoys me."'
 			end	
 				
-			act 'Step away':gt 'gdkin'
+			act 'Step away':gt 'pav_disco'
 		end
 		
 	elseif NikoPayback = 2 and NikoPayed = daystart:
-		act 'Walk away':gt 'gdkin'
+		act 'Walk away':gt 'pav_disco'
 	elseif NikoPayback = 0:
 		act 'Leave':
 			*clr & cla
@@ -646,11 +646,11 @@ if $ARGS[0] = 'Disco Chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You tell Niko. "I would love to stay, but I need to head home early today, or my <<$npc_nickname[''A29'']>> will freak out." He responds "I know how parents can be, I will always be around, if you ever have a few minutes to spare." You give Niko a warm smile as you wave goodbye.'
 					
-			act 'Step away':gt 'gdkin'
+			act 'Step away':gt 'pav_disco'
 		end
 		
 	elseif NikoPayback = 3:
-		act 'Walk away':gt 'gdkin'		
+		act 'Walk away':gt 'pav_disco'		
 	end	
 end
 
@@ -719,7 +719,7 @@ if $ARGS[0] =  'Disco Breakup':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'			
 			'You reply, "You got that right." You then wind up your leg before ramming it in between his legs, kicking him squarely, in the balls, causing him to drop to the ground, squirming in pain. You spit on Niko before walking away.'
 	
-			act 'Step away':gt 'gdkin'
+			act 'Step away':gt 'pav_disco'
 		end	
 	end	
 end	
@@ -732,7 +732,7 @@ if $ARGS[0] =  'Disco Breakup 2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/aftermath2.jpg"></center>'	
 	'You see Niko on the ground, squirming in pain and can''t help but feel very satisfied, seeing Niko get what he deserved.'
 
-	act 'Step away':gt 'gdkin'
+	act 'Step away':gt 'pav_disco'
 end	
 
 !!!!!!!!!!!!!!!

+ 7 - 7
locations/NikoPayback.qsrc

@@ -182,7 +182,7 @@ if $ARGS[0] =  'Payback 3':
 			gs 'stat'	
 		
 			if NikoDiscoPay = 1:
-				act 'Finish':NikoDiscoPay = 0 & gt 'gdkin'
+				act 'Finish':NikoDiscoPay = 0 & gt 'pav_disco'
 			else				
 				act 'Finish':gt 'gschool_lunch', 'break'
 			end	
@@ -210,7 +210,7 @@ if $ARGS[0] =  'Payback 3':
 				gs 'stat'	
 				
 				if NikoDiscoPay = 1:
-					act 'Finish':NikoDiscoPay = 0 & gt 'gdkin'
+					act 'Finish':NikoDiscoPay = 0 & gt 'pav_disco'
 				else				
 					act 'Finish':gt 'gschool_lunch', 'break'
 				end
@@ -236,7 +236,7 @@ if $ARGS[0] =  'Payback 3':
 				gs 'stat'
 				
 				if NikoDiscoPay = 1:
-					act 'Finish':NikoDiscoPay = 0 & gt 'gdkin'
+					act 'Finish':NikoDiscoPay = 0 & gt 'pav_disco'
 				else				
 					act 'Finish':gt 'gschool_lunch', 'break'
 				end	
@@ -263,7 +263,7 @@ if $ARGS[0] =  'Payback 3':
 			gs 'stat'
 				
 			if NikoDiscoPay = 1:
-				act 'Finish':NikoDiscoPay = 0 & gt 'gdkin'
+				act 'Finish':NikoDiscoPay = 0 & gt 'pav_disco'
 			else				
 				act 'Finish':gt 'gschool_lunch', 'break'
 			end	
@@ -291,7 +291,7 @@ if $ARGS[0] =  'Payback 3':
 			gs 'stat'
 			
 			if NikoDiscoPay = 1:
-				act 'Finish':NikoDiscoPay = 0 & gt 'gdkin'
+				act 'Finish':NikoDiscoPay = 0 & gt 'pav_disco'
 			else				
 				act 'Finish':gt 'gschool_lunch', 'break'
 			end	
@@ -709,9 +709,9 @@ if $ARGS[0] = 'Vitek Help 2':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big11.jpg"></center>'		
 			'Vasily approaches you then says, "You are safe now <<$pcs_firstname>>. We will make sure that Niko never touches you again." You give Vasily a hug as you respond, "Thank you all so much for your help. You''re the best." Vasily gives you a pat on the back before saying, "You don''t need to thank us. It''s a mans job to keep girls safe. Here have a drink, on me." Vasily hands you a bottle of beer then turns back around to join Vitek and Dan in beating up Niko.'				
 		
-			act 'Walk away':gt 'gdkin'
+			act 'Walk away':gt 'pav_disco'
 			
-			act 'Have a drink then walk away': gs 'drugs', 'alcohol', 'beer' & gt 'gdkin'
+			act 'Have a drink then walk away': gs 'drugs', 'alcohol', 'beer' & gt 'pav_disco'
 		end
 	end	
 end

+ 49 - 49
locations/Snpc.qsrc

@@ -48,8 +48,8 @@ if npc_grupTipe['A<<numnpc>>'] = 5 and grupTipe ! 5:
 				gs 'stat'
 				'You mock the school outcast as the other students laugh at them.'
 
-				if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
-				if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
+				if $loc ! 'pav_disco':gt 'gschool_lessons', 'short_break'
+				if $loc = 'pav_disco':act 'Move away':gt $loc, $loc_arg
 			end
 		else
 			act 'Mock (<<will_cost>> Willpower)':
@@ -58,8 +58,8 @@ if npc_grupTipe['A<<numnpc>>'] = 5 and grupTipe ! 5:
 				gs 'stat'
 				'You begin to mock them, but <<$npc_firstname[$static_num]>> answers you. "You''re one to talk cocksucker, everyone knows you''re the easiest fuck in town." Everyone starts laughing at you. You are shocked and confused by everyone turning on you, and you hurry away as the others start to talk about you.'
 
-				if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
-				if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
+				if $loc ! 'pav_disco':gt 'gschool_lessons', 'short_break'
+				if $loc = 'pav_disco':act 'Move away':gt $loc, $loc_arg
 			end
 		end
 	else
@@ -75,19 +75,19 @@ if numnpc = 9:gs 'kotovtalker'
 !!!Niko Volkov!!!!
 !!!!!!!!!!!!!!!!!!
 
-if numnpc = 189 and $loc ! 'gdkin' and NikoBreakup = 1:
+if numnpc = 189 and $loc ! 'pav_disco' and NikoBreakup = 1:
 	gt 'NikoEv', 'Lunch Breakup'
-elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakup = 1:
+elseif numnpc = 189 and $loc = 'pav_disco' and NikoBreakup = 1:
 	gt 'NikoEv', 'Disco Breakup'
-elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakupDay = daystart:
+elseif numnpc = 189 and $loc = 'pav_disco' and NikoBreakupDay = daystart:
 	gt 'NikoEv', 'Disco Breakup 2'
-elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 0:
+elseif numnpc = 189 and $loc ! 'pav_disco' and NikoIntro = 0:
 	gt 'NikoEv', 'Lunch Intro'
-elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 1:
+elseif numnpc = 189 and $loc ! 'pav_disco' and NikoIntro = 1:
 	gt 'NikoEv', 'Lunch Chat'
-elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 0:
+elseif numnpc = 189 and $loc = 'pav_disco' and NikoIntro = 0:
 	gt 'NikoEv', 'Disco Intro'
-elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 1:
+elseif numnpc = 189 and $loc = 'pav_disco' and NikoIntro = 1:
 	gt 'NikoEv', 'Disco Chat'
 end
 
@@ -95,7 +95,7 @@ end
 !!!gopniks!!!
 !!!!!!!!!!!!!
 if npc_grupTipe['A<<numnpc>>'] = 4:
-	if $loc = 'gdkin':
+	if $loc = 'pav_disco':
 		if fame['pav_slut'] < 300:
 			if numnpc ! 9:
 				if npc_gender['A<<numnpc>>'] = 0:
@@ -132,7 +132,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 end
 
 if numnpc = 144:
-	if $loc ! 'gdkin' and npc_rel['A<<numnpc>>'] > 50 and (Anush_sex > 0 or hotcat >= 7) and rand(0,4) = 0:
+	if $loc ! 'pav_disco' and npc_rel['A<<numnpc>>'] > 50 and (Anush_sex > 0 or hotcat >= 7) and rand(0,4) = 0:
 		act 'You''re looking flushed':
 			*clr & cla
 			if Anush_lunch = 0:
@@ -216,7 +216,7 @@ if numnpc = 23:
 			'You ask Albina if she knows where you could get a tiny camera, saying it''s for a prank you''re pulling on your parents. Albina smiles and nods. "There''s a photo studio in the city, they''ll have that you need!"'
 			'You thank her for the help. Maybe now you''ll finally be able to get out of this hell.'
 
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -245,7 +245,7 @@ if narkoman = 1 and numnpc = 1 and npc_rel['A1'] >= 100:
 	end
 end
 
-if $loc ! 'gdkin':
+if $loc ! 'pav_disco':
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 else
 	act 'Move away': gt $loc, $loc_arg
@@ -255,7 +255,7 @@ end
 act 'Chat':
 	*clr & cla
 
-	if $loc = 'gdkin':minut += 5
+	if $loc = 'pav_disco':minut += 5
 
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
@@ -265,7 +265,7 @@ act 'Chat':
 		cla
 		'Dimka doesn''t try to hide his disdain for you. "Get away from me, you pimply pig."'
 
-		if $loc ! 'gdkin':
+		if $loc ! 'pav_disco':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		else
 			act 'Move away': gt $loc, $loc_arg
@@ -274,7 +274,7 @@ act 'Chat':
 		exit
 	end
 
-	if $loc ! 'gdkin':
+	if $loc ! 'pav_disco':
 		gs 'nogorslut'
 		gs 'yesgorslut'
 		
@@ -291,7 +291,7 @@ end
 if numnpc = 13 and lariskaHelp = -1:
 	'She looks at you rejectingly and softly says, "Leave me alone, <<$pcs_nickname>>. I want nothing to do with you any more."'
 
-	if $loc ! 'gdkin':
+	if $loc ! 'pav_disco':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away': gt $loc, $loc_arg
@@ -304,7 +304,7 @@ if numnpc = 2:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 
-			if $loc = 'gdkin':minut += 5
+			if $loc = 'pav_disco':minut += 5
 
 			npc_rel['A<<numnpc>>'] += 5
 
@@ -317,7 +317,7 @@ if numnpc = 2:
 			if fame['pav_slut'] < 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised. "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
 			if fame['pav_slut'] >= 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged. "Bah... the school whore needs my help? I don''t think so."'
 
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -330,12 +330,12 @@ end
 if numnpc = 3:gt 'IvanEv', 'School Chat'
 
 !!Vitek Kotov
-if numnpc = 9 and kotovloveqw > 0 and $loc ! 'gdkin' and NikoPayback = 2:act 'Tell him about Niko':gt 'NikoPayback', 'Vitek Help'
+if numnpc = 9 and kotovloveqw > 0 and $loc ! 'pav_disco' and NikoPayback = 2:act 'Tell him about Niko':gt 'NikoPayback', 'Vitek Help'
 
 !!Fedor Kozlov
-if numnpc = 5 and $loc ! 'gdkin' and FedorLove < 0:
+if numnpc = 5 and $loc ! 'pav_disco' and FedorLove < 0:
 	gt 'FedorMisc', 'Fedor Hate'
-elseif numnpc = 5 and $loc ! 'gdkin':
+elseif numnpc = 5 and $loc ! 'pav_disco':
 	gt 'FedorMisc', 'Fedor Chat'
 end
 
@@ -345,7 +345,7 @@ if numnpc = 12:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 
-			if $loc = 'gdkin':minut += 5
+			if $loc = 'pav_disco':minut += 5
 
 			npc_rel['A<<numnpc>>'] += 5
 			JuliaMilLernQW = 1
@@ -355,7 +355,7 @@ if numnpc = 12:
 
 			if fame['pav_slut'] < 250:'You approach Julia and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees. "Sure <<$pcs_nickname>>, that could be fun!"'
 			if fame['pav_slut'] >= 250:'You approach Julia and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway as long as you don''t tell anyone.'
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				act' Leave': xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -370,7 +370,7 @@ if numnpc = 14:
 		act 'Thank Katja for taking you home from the disco':
 			*clr & cla
 
-			if $loc = 'gdkin':minut += 5
+			if $loc = 'pav_disco':minut += 5
 
 			npc_rel['A<<numnpc>>'] += 5
 			meynoldQW = 2
@@ -379,7 +379,7 @@ if numnpc = 14:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big<<numnpc>>.jpg"></center>'
 			'You approach Katja and thank her for taking you home from the disco when you were drunk the other night. Katja gives you a knowing smile and says, "Don''t mention it, <<$pcs_nickname>>! You really shouldn''t get that drunk at the disco though, that could end badly. Some of the guys there are real pigs..."'
 
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -389,7 +389,7 @@ if numnpc = 14:
 	if rand(1,3) = 1 and npc_sex['A14'] = 1 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart: gt 'Katja_tanga', 'start'
 	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
 		*clr
-		if $loc = 'gdkin':
+		if $loc = 'pav_disco':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss1.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
@@ -407,7 +407,7 @@ if numnpc = 14:
 			*clr & cla
 			pcs_hairbsh = 1
 
-			if $loc = 'gdkin':minut += 5
+			if $loc = 'pav_disco':minut += 5
 
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
@@ -420,7 +420,7 @@ if numnpc = 14:
 				'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
 
 				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
-				if $loc ! 'gdkin':
+				if $loc ! 'pav_disco':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
 					act 'Move away': gt $loc, $loc_arg
@@ -433,7 +433,7 @@ if numnpc = 14:
 				'Katja applies some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
 
 				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
-				if $loc ! 'gdkin':
+				if $loc ! 'pav_disco':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
 					act 'Move away': gt $loc, $loc_arg
@@ -446,7 +446,7 @@ if numnpc = 14:
 				'Katja applies some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
 
 				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
-				if $loc ! 'gdkin':
+				if $loc ! 'pav_disco':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
 					act 'Move away': gt $loc, $loc_arg
@@ -459,9 +459,9 @@ if numnpc = 14:
 		!!new Katja stuff not sure where you want to put it. It should be an option when you talk to her at school or the dance where it says Chat, but add this as an option.
 		act 'Kiss Katja':
 			*clr & cla
-			if $loc = 'gdkin':
+			if $loc = 'pav_disco':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss1.jpg"></center>'
-			elseif $loc ! 'gdkin':
+			elseif $loc ! 'pav_disco':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
 			end
 			minut += 1
@@ -469,7 +469,7 @@ if numnpc = 14:
 			'You lean in to kiss Katja'
 			if Katjahorny < 30:
 				'She pulls away from you as you try to kiss her. She looks around to see if anyone saw. "Not here and not now."'
-				if $loc ! 'gdkin':
+				if $loc ! 'pav_disco':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
 					act 'Move away': gt $loc, $loc_arg
@@ -488,7 +488,7 @@ if numnpc = 14:
 	if apmeet = 3 and artemIzdev = 0:
 		act 'Ask how to stop Artem and Petka''s blackmail':
 			*clr & cla
-			if $loc = 'gdkin':minut += 5
+			if $loc = 'pav_disco':minut += 5
 			artemIzdev = 1
 			gs 'stat'
 
@@ -497,7 +497,7 @@ if numnpc = 14:
 			'You make sure no one else is paying attention and tell Katja about what Artem and Petka are doing to you on Mondays. At first, she doesn''t believe you. After a while, all of the nasty details you''re sharing convince her that there is no way you''re making this up. Katja is shocked!'
 			'You tell her that the only way you have thought of to get rid of their blackmailing is to get blackmailing material of your own. Katja nods and says, "That makes sense, actually... if you could somehow make it look violent, I bet it would work even better! I don''t know where you would be able to find a tiny camera though... maybe Albina can help you?"'
 
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -506,13 +506,13 @@ if numnpc = 14:
 	end
 
 	if meynoldQW > 1 and pcs_makeup > 1:
-		if $loc ! 'gdkin':
+		if $loc ! 'pav_disco':
 			!!school
 			!!if KatjaHorny >= 50:end
 			!!if KatjaHorny < 50:end
 		end
 
-		if $loc = 'gdkin':
+		if $loc = 'pav_disco':
 			!!at the disco
 			!!if KatjaHorny >= 50:end
 			!!if KatjaHorny < 50:end
@@ -526,7 +526,7 @@ if numnpc = 16:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 
-			if $loc = 'gdkin':minut += 5
+			if $loc = 'pav_disco':minut += 5
 
 			npc_rel['A<<numnpc>>'] += 5
 			NatbelQW['QWstage'] = 1
@@ -536,7 +536,7 @@ if numnpc = 16:
 
 			if fame['pav_slut'] < 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees. "Sure <<$pcs_nickname>>, that could be fun!"'
 			if fame['pav_slut'] >= 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway as long as you don''t tell anyone.'
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -567,7 +567,7 @@ if numnpc = 16:
 				'Her tongue starts to lick your clit. You bite your lip to try and keep from moaning too loudly. You lean back and relax as you let Natasha pleasure you with her tongue. She is getting a lot better at this, and if you''re not mistaken, she is starting to like it a lot.'
 				'She starts using her fingers on you as well and is really getting into it. You start to pant and moan, clamping a hand over your own mouth to keep yourself from crying out. It doesn''t take her long to bring you to a climax.'
 				'Your whole body shudders as the orgasm rocks your body. You grind your pussy against her face as it does. Once the sensation has passed, you look down and see Natasha smiling up at you, obviously pleased with herself. You lean down and give her a long, slow, passionate kiss, tasting your own pussy juices. A few moments later, the bell rings, and you both hurry to class.'
-				if $loc ! 'gdkin':
+				if $loc ! 'pav_disco':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
 					act 'Move away': gt $loc, $loc_arg
@@ -587,7 +587,7 @@ if numnpc = 31:
 		'"So Lizaveta, hear any good gossip of late?"'
 		'As you ask that, her face lights up, and she leans in close like she has the best secret in the world to share with you. "Oh my god yes! I was... well it doesn''t matter what I was doing, but I overheard some others talking, and they said..."'
 		gs 'gschool_gossip', 'Lizaveta'
-		if $loc ! 'gdkin':
+		if $loc ! 'pav_disco':
 			xgt 'gschool_lessons', 'short_break', 'nopict'
 		else
 			act 'Move away': gt $loc, $loc_arg
@@ -609,7 +609,7 @@ if numnpc = 231:
 			'<<$npc_firstname[''A<<numnpc>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond, and there is a long pause as a result. Finally after about 30 seconds of thought, she responds, "Sure, that should be alright. Do you mind going home with me first so that I can change out of our uniform?"'
 			'"That is no problem at all," you reply. "I''ll meet you outside of school after our last period, and then we can head to your house together."'
 			'"Sounds good <<$pcs_nickname>>. See you then," <<$npc_firstname[''A<<numnpc>>'']>> replies as she heads off.'
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -627,7 +627,7 @@ if numnpc = 231:
 			'<<$npc_firstname[''A<<numnpc>>'']>> replies, "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore. I don''t want to get whatever you had and miss school as well."'
 			'You giggle a little bit and reply, "Nah, I got over my sickness, so you should be fine. I''ll meet you outside of school after our last period, and then we can head to your house together."'
 			'"Sounds good <<$pcs_nickname>>. See you then," <<$npc_firstname[''A<<numnpc>>'']>> replies as she heads off.'
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -649,7 +649,7 @@ if numnpc = 231:
 			'<<$npc_nickname[''A<<numnpc>>'']>> doesn''t respond and almost looks like she''s about to start crying. She finally whimpers, "Are you mad at me, or are you sickened by me?"'
 			'Not completely surprised by what she said, you hold firm in making sure to wait until the two of you are alone. "I don''t wan''t to discuss things here. Meet me after school so we can talk about this more. I promise I''m not going to hurt you if that is what you''re afraid of."'
 			'Looking a little relieved, <<$npc_firstname[''A<<numnpc>>'']>> nods her head in a slow manner and sheds a couple of tears. You walk away without either of you saying another word."'
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -662,7 +662,7 @@ if numnpc = 231:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big<<numnpc>>.jpg"></center>'
 			'As you see <<$npc_firstname[''A<<numnpc>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. You don''t have enough courage to bring up what happened the last time you were at <<$npc_firstname[''A<<numnpc>>'']>>''s house, so you pretend to not see her and carry on your way.'
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $loc_arg
@@ -682,7 +682,7 @@ if numnpc = 231:
 !!Image needed			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/aleksandra/school_kiss.jpg"></center>'
 			'You lean in to kiss <<$npc_firstname[''A<<numnpc>>'']>>, and you both close your eyes as your lips meet. You don''t really care what anyone else thinks. You both just enjoy the moment.' 
 			'You eventually break off the kiss and say, "See you later cutie," and head on your way.'
-			if $loc ! 'gdkin':
+			if $loc ! 'pav_disco':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $loc_arg

+ 1 - 1
locations/dimaRevenge.qsrc

@@ -874,7 +874,7 @@ if dimaRevChoice = 4:
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/revenge/thepopo.jpg"></center>'
 							'You, Anushka, and Alyona head back to the dance and have a few beers, tossing his clothes in the trash. After a few minutes, you hear a scream coming from the restroom. One of the girls must have found Dimka. She runs out screaming pervert. A few minutes later you hear sirens as the cops arrive. Everyone heads towards them to see who they are arresting. The cops drag a naked Dimka out of the restroom as several kids take pictures with their phones. Then they put him in the back of a police car and drive off. People will be talking about this for a while. For the first time, you can''t wait for school tomorrow.'
-							act 'Continue': gt 'gdkin'
+							act 'Continue': gt 'pav_disco'
 						end
 					end
 				end

+ 22 - 22
locations/gdksex.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'outside':
 					if deystrand = 0 and pcs_apprnc >= randvnesh:
 						'"I would love to see you again! How about you give me your number, so we can go on a date some time?" he adds.'
 
-						act 'Decline and go back to the disco': gt 'gdkin'
+						act 'Decline and go back to the disco': gt 'pav_disco'
 						act 'Give him your number':
 							*clr & cla
 							pcs_mood += 10
@@ -56,17 +56,17 @@ if $ARGS[0] = 'outside':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 							'You smile and give him your phone number, which he diligently adds to his phone.'
 							'"I hope I''ll see you again soon, <<$pcs_firstname>>. I''ll call you!" he says as he packs up his things. You get up as well, and chat with him as you head back to the disco.'
-							act 'Return to the disco': gt 'gdkin'
+							act 'Return to the disco': gt 'pav_disco'
 						end
 					elseif deystrand > 0 or pcs_apprnc < randvnesh:
 						'<<$npc_firstname[$npclastsaved]>> scoots over until he''s right next to you, and kisses you on the lips.'
 
-						act 'Go back to the disco': gt 'gdkin'
+						act 'Go back to the disco': gt 'pav_disco'
 
 						gs 'gdksex', 'kissing'
 					end
 				end
-				act 'Go back to the disco': gt 'gdkin'
+				act 'Go back to the disco': gt 'pav_disco'
 			end
 		else
 			act 'Don''t drink the beer (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -140,7 +140,7 @@ if $ARGS[0] = 'outside':
 											gs 'willpower', 'bj', 'resist'
 											gs 'willpower', 'pay', 'resist'
 											gs 'stat'
-											gt 'gdkin'
+											gt 'pav_disco'
 										end
 									else
 										act 'Go back to the disco (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -193,7 +193,7 @@ if $ARGS[0] = 'outside':
 					if deystrand = 0 and pcs_apprnc >= randvnesh:
 						'He checks his watch and frowns. "I have to get going, but I would love to see you again! How about you give me your number, so we can go on a date some time?"'
 
-						act 'Decline and go back to the disco': gt 'gdkin'
+						act 'Decline and go back to the disco': gt 'pav_disco'
 						act 'Give him your number':
 							*clr & cla
 							pcs_mood += 10
@@ -205,7 +205,7 @@ if $ARGS[0] = 'outside':
 							gs 'stat'
 							'You smile and give him your number, which he diligently adds to his phone.'
 							'"I hope I''ll see you again soon, <<$pcs_firstname>>. I''ll call you!" he says as he packs up his things. You get up as well, and chat with him as you head back to the disco.'
-							act 'Go back to the disco': gt 'gdkin'
+							act 'Go back to the disco': gt 'pav_disco'
 						end
 					elseif deystrand = 1 or pcs_apprnc < randvnesh:
 						'<<$npc_firstname[$npclastsaved]>> scoots over until he''s right next to you, and kisses you on the lips.'
@@ -217,7 +217,7 @@ if $ARGS[0] = 'outside':
 									gs 'willpower', 'mast', 'resist'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'gdkin'
+									gt 'pav_disco'
 								end
 							else
 								act 'Go back to the disco (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'outside':
 								gs 'willpower', 'mast', 'resist'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'gdkin'
+								gt 'pav_disco'
 							end
 						else
 							act 'Go back to the disco (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -312,7 +312,7 @@ if $ARGS[0] = 'outside':
 				'You shrug and leave without saying another word, secretly smiling to yourself. Men really <i>are</i> gullible sometimes.'
 				'While you''re walking back to the disco, several guys are giving you confused looks. The word spread fast, and guys quickly get a message that you''re no easy lay after all. Your reputation improves a little as a result.'
 
-				act 'Go back to the disco': gt 'gdkin'
+				act 'Go back to the disco': gt 'pav_disco'
 			end
 		else
 			act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -355,7 +355,7 @@ if $ARGS[0] = 'decline':
 				'You just laugh at him. "Put that away, because I''m going anywhere near it!"'
 				'You then leave without saying another word, ignoring his pleas.'
 
-				act 'Go back to the disco': gt 'gdkin'
+				act 'Go back to the disco': gt 'pav_disco'
 			end
 		else
 			act 'Decline and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -381,7 +381,7 @@ if $ARGS[0] = 'kissing':
 					gs 'willpower', 'mast', 'resist'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'gdkin'
+					gt 'pav_disco'
 				end
 			else
 				act 'Go back to the disco (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -424,7 +424,7 @@ if $ARGS[0] = 'kissing':
 							gs 'willpower', 'mast', 'resist'
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
-							gt 'gdkin'
+							gt 'pav_disco'
 						end
 					else
 						act 'Go back to the disco (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -446,7 +446,7 @@ if $ARGS[0] = 'kissing':
 									gs 'willpower', 'mast', 'resist', 'hard'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'gdkin'
+									gt 'pav_disco'
 								end
 							else
 								act 'Remove his hands and walk away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -583,7 +583,7 @@ if $ARGS[0] = 'kissing':
 											'You confidently stand up confidently and smile at him. "That was great! Now, I believe I owe you something."'
 											'Wrapping your fingers around his cock, you begin to jerk him off while you kiss him again. You let him grab your breasts while you stroke his length, and in no time at all he lets out a muffled groan as thick gobs of cum land on the ground.'
 
-											act 'Go back to the disco': gt 'gdkin'
+											act 'Go back to the disco': gt 'pav_disco'
 										end
 									else
 										act 'Jerk him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -610,7 +610,7 @@ if $ARGS[0] = 'kissing':
 								gs 'willpower', 'mast', 'resist'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'gdkin'
+								gt 'pav_disco'
 							end
 						else
 							act 'Go back to the disco (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -632,7 +632,7 @@ if $ARGS[0] = 'kissing':
 									gs 'willpower', 'mast', 'resist'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'gdkin'
+									gt 'pav_disco'
 								end
 							else
 								act 'Go back to the disco (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -685,7 +685,7 @@ if $ARGS[0] = 'handjob_end':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 		'You release him and quickly begin walking away, '
 		'"See you later!" you grin while waggling your cum covered fingers at him, leaving him with his cock hanging out and covered in his own cum.'
-		act 'Head back inside':gt'gdkin'
+		act 'Head back inside':gt'pav_disco'
 		
 		if trt_cumeater < 0:
 			act 'Lick your hand clean on the way':
@@ -695,7 +695,7 @@ if $ARGS[0] = 'handjob_end':
 				gs'cum_cleanup'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 				'On your way back inside, you run your tongue along your hand, licking up the cum that webs across your fingers. You manage to swallow every last drop just before getting to the door and you head back inside.'
-				act 'Continue':gt'gdkin'
+				act 'Continue':gt'pav_disco'
 			end
 		end
 		
@@ -707,7 +707,7 @@ if $ARGS[0] = 'handjob_end':
 				gs'cum_cleanup'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 				'On your way back inside, you pull some wipes from your bag and clean your hands, tossing the cum covered wipe before you step through the doors.'
-				act 'Continue':gt'gdkin'
+				act 'Continue':gt'pav_disco'
 			end
 		end		
 	end
@@ -831,7 +831,7 @@ if $ARGS[0] = 'blowjob':
 					'"What?? You think I''m going to just get back down there after the way you''re acting?"'
 					'"But you said you didn''t want to fuck!" he says angrily.'
 					'"Ugh, I don''t want to deal with you." You quickly back away from <<$npc_firstname[$npclastsaved]>>, leaving him with blue balls and his dick hanging out as you head back to the disco.'
-					act 'Go back to the disco': gt'gdkin'
+					act 'Go back to the disco': gt'pav_disco'
 				end
 				
 				act 'Finish sucking him off':gt'gdksex','blowjob'
@@ -844,7 +844,7 @@ if $ARGS[0] = 'blowjob':
 				if npc_selfish = 1:
 					'"You were just sucking my dick!" he almost shouts again. "Why is it too public to fuck but it isn''t to suck my dick?!"'
 					'"It just is!" you huff back. "You know what? This whole thing was a mistake. You can sort that out yourself," you say, gesturing at his cock before you hurry away from him and back towards the disco.'
-					act 'Go back to the disco': gt'gdkin'
+					act 'Go back to the disco': gt'pav_disco'
 				elseif gdk_nice_guy = 1:
 					'"Well..." <<$npc_firstname[$npclastsaved]>> scratches his head for a moment in confusion. "We don''t <i>have</i> to do it in public. We could take this back to my place if you want..."'
 					act 'Refuse':

+ 2 - 2
locations/gdktoilet.qsrc

@@ -53,12 +53,12 @@ if $ARGS[0] = 'start':
 		end
 		if gdkincum ! daystart:
 			if gdkin_in = daystart:
-				act 'Return to the dance':gt 'gdkin'
+				act 'Return to the dance':gt 'pav_disco'
 			elseif money >= 25:
 				act 'Go to the dance (25 <b>₽</b>)':
 					money -= 25
 					minut += 5
-					gt 'gdkin'
+					gt 'pav_disco'
 				end
 			end
 		else

+ 1 - 1
locations/gdktoilet_womens.qsrc

@@ -628,7 +628,7 @@ if $ARGS[0] = 'rape':
 			minut +=10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
 			'You continue to dance until the man has left.'
-			act 'Stop': gt 'gdkin'
+			act 'Stop': gt 'pav_disco'
 		end
 	else
 		*clr & cla

+ 4 - 4
locations/gopskver.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = '':
 					*nl
 					if week = 5 or week = 6:
 						'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
-						act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
+						act 'Go to the disco with the boys':minut += 15 & gt 'pav_disco'
 					else
 						'It''s evening, and the boys are getting ready to go to Vasily'' Home. You could call it a night and leave them alone, or tag along.'
 						act 'Go with the boys':minut += 15 & gt 'shulgahall'
@@ -86,7 +86,7 @@ if $ARGS[0] = '':
 			act 'Leave':gt 'pav_park', 'start'
 			if week = 5 or week = 6:
 				'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
-				act 'Go to the disco with the boys': minut += 15 & gt 'gdkin'
+				act 'Go to the disco with the boys': minut += 15 & gt 'pav_disco'
 			else
 				'It''s evening, and the boys are getting ready to go to Vasily''s home. You could call it a night and leave them alone, or tag along.'
 				act 'Go to with the boys': minut += 15 & gt 'shulgahall'
@@ -99,7 +99,7 @@ if $ARGS[0] = '':
 				act 'Leave':gt 'pav_park', 'start'
 				if week = 5 or week = 6:
 					'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
-					act 'Go to the disco with the boys': minut += 15 & gt 'gdkin'
+					act 'Go to the disco with the boys': minut += 15 & gt 'pav_disco'
 				else
 					'It''s evening, and the boys are getting ready to go to Vasily''s home. You could call it a night and leave them alone, or tag along.'
 					act 'Go to with the boys': minut += 15 & gt 'shulgahall'
@@ -276,7 +276,7 @@ if $ARGS[0] = '':
 							*nl
 							if week = 5 or week = 6:
 								'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
-								act 'Go to the disco with the boys': minut += 15 & gt 'gdkin'
+								act 'Go to the disco with the boys': minut += 15 & gt 'pav_disco'
 							else
 								'It''s evening, and the boys are getting ready to go to Vasily''s home. You could call it a night and leave them alone, or tag along.'
 								act 'Go with the boys': minut += 15 & gt 'shulgahall'

+ 1 - 1
locations/igorev.qsrc

@@ -302,7 +302,7 @@ end
 
 if $ARGS[0] = 'din_igor_end':
 	*nl
-	if $loc = 'gdkin':
+	if $loc = 'pav_disco':
 		'With Igor having taken you to his house you should take advantage and use his bathroom to freshen up.'
 	else
 		'You should go to the bathroom to freshen up.'

+ 1 - 1
locations/igorhome.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'igorroom':
 		end
 		if week = 5 or week = 6:
 			'Igor looks at his watch and asks you "I want to have fun tonight. Let''s go to the disco!"'
-			act 'Agree': & minut += 20 & gt 'gdkin' & !!if they are dating I will add a new version but have not written it yet.
+			act 'Agree': & minut += 20 & gt 'pav_disco' & !!if they are dating I will add a new version but have not written it yet.
 			act 'Decline and go home': gt 'pav_residential'
 			act 'Decline and chat instead':gt 'igorhome','Chat'
 		else

+ 9 - 9
locations/katjaEv.qsrc

@@ -622,8 +622,8 @@ if $ARGS[0] = 'kiss_events':
 	if flag_start_parc = 0:
 		flag_start_parc += 1
 		'While you kissed Katja, someone came nearby sighed loudly, probably, appreciating the view. But when you could break away from Katja''s lips, there was no one there.'
-		if $loc = 'gdkin':
-			act 'Return to dance': gt 'gdkin'
+		if $loc = 'pav_disco':
+			act 'Return to dance': gt 'pav_disco'
 		else
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
@@ -643,8 +643,8 @@ if $ARGS[0] = 'kiss_events':
 		'While you kissed Katja, someone came nearby sighed loudly, probably, appreciating the view.'
 		'"Like <<$textEvent>>, you girls are just so a part of each other. Are all girls as close as the two of you?" You''re so surprised with this unexpectedly accurate comparison, then turned around and saw Ivan Prokhorov, who tenderly looked at you and Katja.'
 		'"Thank you, MAN and I don''t know." you reply. He again sighed, and left misty-eyed.'
-		if $loc = 'gdkin':
-			act 'Return to dance': gt 'gdkin'
+		if $loc = 'pav_disco':
+			act 'Return to dance': gt 'pav_disco'
 		else
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
@@ -681,9 +681,9 @@ if $ARGS[0] = 'moron':
 				'"And I can kiss all the boys." you said, under the joyous hubbub of guys gathering near you. You began to kiss all the boys in succession, carefully avoiding the one that called you a lesbian.'
 				'Seeing this he said offended. "The redhead doesn''t like guys, I bet." hoping Katja will kiss him to prove him wrong.'
 				'But Katja recovered and said. "Wrong again loser.", and began to repeat your route, of kissing the boys.'
-				if $loc = 'gdkin':
+				if $loc = 'pav_disco':
 					'After kissing the last boy, you turn back and make sure Katja kisses all of them too. You now realise the guys are hoping for more and quickly drag Katja away before you accidentally start an orgy.'
-					act 'Return to dance': gt 'gdkin'
+					act 'Return to dance': gt 'pav_disco'
 				else
 					'Just as you kissed the last boy, you turned around to see how Katja was doing with her kissing, but then the bell rang, and you all rushed to class.'
 					act 'Continue': gt 'gschool_lessons', 'short_break'
@@ -705,7 +705,7 @@ if $ARGS[0] = 'moron':
 		'Ivan shrugged, looking a little embarrassed. But it was obvious, he was pleased.'
 		act 'Thank Ivan':
 			*clr & cla
-			if npc_sex['A3'] = 1 and $loc ! 'gdkin':
+			if npc_sex['A3'] = 1 and $loc ! 'pav_disco':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/whisper.jpg"></center>'
 				'Approaching Ivan, you raised up on tiptoe, and, clasping her arms round his neck, and kissed, and then whispered. "Like kissing girls?" Ivan only replied with a dumbfounded nodded, "Well, then we can show you our appreciation, right Katja?"'
 				'Katja, nods only half paying attention. Then it hit her what you said, she looked at Ivan, at you and her eyes lit up with lustful fire, "Right."'
@@ -720,8 +720,8 @@ if $ARGS[0] = 'moron':
 					'You only snorted at Katja''s words, although Ivan did have a fine looking ass.'
 				end
 
-				if $loc = 'gdkin':
-					act 'Return to dance': gt 'gdkin'
+				if $loc = 'pav_disco':
+					act 'Return to dance': gt 'pav_disco'
 				else
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end

+ 4 - 4
locations/kotovtalker.qsrc

@@ -2,7 +2,7 @@
 !2021/05/02
 
 if numnpc = 9 and fame['pav_slut'] < 200 and kotovLoveQW >= 0 and (npc_rel['A9'] >= 80 or hotcat >= 5):
-	if $loc = 'gdkin':
+	if $loc = 'pav_disco':
 		if alko < 3:
 			'<<$npc_firstname[''A9'']>>: "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
 			gs 'willpower', 'drink', 'resist', 'medium'
@@ -129,7 +129,7 @@ elseif kotovLoveQW > 0 and fame['pav_slut'] > 200:
 		'You started yelling at Vitek that he has fucked other girls. Vitek started yelling at you and suddenly, there is a ringing in your head, your vision is blurry. You find you''re on the floor, with Vitek standing over you. Your cheek burns with pain, it takes you a few moments to understand what happened, it seems he slapped you, so hard it knocked you off your feet. "Stay away from me you fucking whore, it''s over between us!"'
 
 		if $loc = 'gschool_lunch':gt 'gschool_lessons', 'short_break'
-		if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
+		if $loc = 'pav_disco':act 'Move away':gt $loc, $loc_arg
 	end
 
 	gs 'willpower', 'misc', 'force', 'hard'
@@ -143,12 +143,12 @@ elseif kotovLoveQW > 0 and fame['pav_slut'] > 200:
 			'It takes a bit but you convince Vitek that all this was just gossip and none of it was true. Vitek frowned, "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry, baby I will shut their yapping mouths."'
 
 			if $loc = 'gschool_lunch':gt 'gschool_lessons', 'short_break'
-		if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
+		if $loc = 'pav_disco':act 'Move away':gt $loc, $loc_arg
 		end
 	else
 		act 'Argue that it''s not true (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-elseif $loc = 'gdkin':
+elseif $loc = 'pav_disco':
 	if fame['pav_slut'] < 280:
 		'<<$npc_firstname[$static_num]>>: "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
 

+ 1 - 1
locations/krutishi.qsrc

@@ -8,7 +8,7 @@ if npc_grupTipe['A<<numnpc>>'] = 1:
 	elseif npc_gender['A<<numnpc>>'] = 1 and pcs_hairbsh = 0:
 		npc_rel['A<<numnpc>>'] -= 5
 		'<<$npc_firstname[''A<<numnpc>>'']>> looks at you and smiles at your messy hair.'
-	elseif npc_gender['A<<numnpc>>'] = 0 and pcs_hairbsh > 0 and $loc = 'gdkin' and npc_rel['A<<numnpc>>'] >= 40:
+	elseif npc_gender['A<<numnpc>>'] = 0 and pcs_hairbsh > 0 and $loc = 'pav_disco' and npc_rel['A<<numnpc>>'] >= 40:
 		if PCloSkirt > 0:
 			cla
 			'<<$npc_firstname[''A<<numnpc>>'']>>: "Care for a dance?"'

+ 1 - 1
locations/lariska_storyline.qsrc

@@ -323,7 +323,7 @@ if $ARGS[0] = 'Boyfriend_5':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/boyfriend/lev_nightclub.jpg"></center>'
 	'As you enter the nightclub and look around, you recognize someone on the dancefloor. Looking closer, you realize it''s Lev with his arms wrapped around someone with blonde hair. Suprised to find Lariska not only at the disco but actually dancing, you head towards them. About halfway there you catch a glimpse of her face and realize the girl he''s groping isn''t Lariska.'
 	'You consider making a scene, but decide against it. Better to just tell Lariska the next time you are at her house. She is going to be devastated, she really liked him!'
-	act 'Walk away':gt 'gdkin'
+	act 'Walk away':gt 'pav_disco'
 end
 
 !!in bedroom - Tell her about BF breaking the Rule

+ 4 - 4
locations/nogorslut.qsrc

@@ -59,15 +59,15 @@ if fame['pav_slut'] < 250:
 					'He gives you a one armed hug. "<<$pcs_nickname>> your the best, not only are you smoking hot but you are a super cool chick too. If you want to hang out some time you can stop by my place." He pauses a moment and then looks around and leans in close. "Or if you get a little bored during lunch break, you can let me know too." He says with a suggestive tone and waggled eyebrows.'
 
 					'You laugh at his silly antics, it is nice to have found a fun guy to hang out with, perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
-					if $loc ! 'gdkin':act 'Move away':gt 'gschool_lessons', 'short_break'
-					if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
-					if $loc ! 'gdkin':act 'Tell him you''re bored':gt 'gdksport', 'Ivan_bored'
+					if $loc ! 'pav_disco':act 'Move away':gt 'gschool_lessons', 'short_break'
+					if $loc = 'pav_disco':act 'Move away':gt $loc, $loc_arg
+					if $loc ! 'pav_disco':act 'Tell him you''re bored':gt 'gdksport', 'Ivan_bored'
 				end
 
 			elseif npc_rel['A<<numnpc>>'] >= 80:
 				'You chat about random topics and <<$npc_firstname[''A<<numnpc>>'']>> happily listens to your stories, sharing several new stories and anecdotes as well.'
 
-				if IvanShowerQW = 11 and $loc ! 'gdkin':
+				if IvanShowerQW = 11 and $loc ! 'pav_disco':
 					if rand(0,4) = 0:
 						'You start to talk to Ivan when he leans in closes and whispers in your ear. "Tell me you''re bored <<$pcs_nickname>>."'
 						act 'Leave': gt 'gschool_lessons', 'short_break'

+ 2 - 2
locations/pav_commcenter.qsrc

@@ -21,9 +21,9 @@ if $ARGS[0] ! 'XXX':
 		if gdkincum = daystart and (cumloc[6] = 0 and cumloc[7] = 0) and cumloc[11] = 0: gdkincum = 0
 		if gdkincum ! daystart:
 			if gdkin_in = daystart:
-				act 'Return to the dance': gt 'gdkin'
+				act 'Return to the dance': gt 'pav_disco'
 			elseif money >= 25:
-				act 'Go to the dance (25 <b>₽</b>)': money -= 25 & minut += 5 & gt 'gdkin'
+				act 'Go to the dance (25 <b>₽</b>)': money -= 25 & minut += 5 & gt 'pav_disco'
 			end
 		else
 			*nl

+ 377 - 347
locations/gdkin.qsrc → locations/pav_disco.qsrc

@@ -1,20 +1,18 @@
-# gdkin
-!2021/05/02
+# pav_disco
+!2021/06/26
 
 if $ARGS[0] = '':
-	if hour > 19: gdkin_in = daystart
+	if hour > 19: pav_disco_in = daystart
 	$loc_arg = ''
-	$loc = 'gdkin'
+	$loc = 'pav_disco'
 	$location_type = 'public_indoors'
-	$menu_loc = 'gdkin'
+	$menu_loc = 'pav_disco'
 	$menu_arg = ''
 	menu_off = 0
 	boynumBlock = 0
 	gs 'stat'
 	gs 'themes', 'indoors'
-
 	pl ''
-
 	if music_on = 1:
 		$track_loop = 'sound/komb.mp3'
 		volume = 80
@@ -25,47 +23,83 @@ if $ARGS[0] = '':
 		close all
 		pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
 	end
-
-	'<center><b><font color="maroon">Disco</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_yaho.jpg"></center>'
 	*nl
 
+!! check against clothing and makeup impacting social groups only once per day
+	if social_check['disco'] ! daystart:
+		social_check['disco'] = daystart
+		if PCloskirt = 0: 
+			grupvalue[1] -= 1
+			if PCloquality > 4:grupvalue[1] += 1
+		end
+		if PCloquality = 3 or PCloquality = 4: grupvalue[1] -= 1
+		if PCloquality < 3: grupvalue[1] -= 5
+		if PCloInhibit >= 20 and PCloInhibit < 35: grupvalue[2] += 1 & grupvalue[4] += 1
+		if PCloInhibit >= 35: grupvalue[1] -= 3 & grupvalue[2] -= 1
+		if PShoQuality < 3:
+			grupvalue[1] -= 1
+		else
+			grupvalue[1] += 1
+		end
+		if PShoHeels < 2: grupvalue[1] -= 2
+		if pcs_makeup = 0:
+			grupvalue[1] -= 5
+			grupvalue[2] -= 5
+			grupvalue[4] -= 1
+		elseif pcs_makeup = 1: 
+			grupvalue[1] -= 5
+			grupvalue[2] -= 3
+			grupvalue[4] -= 1
+		elseif pcs_makeup = 2: 
+			grupvalue[4] -= 1
+		elseif pcs_makeup = 3: 
+			grupvalue[1] += 1
+		elseif pcs_makeup = 4:
+			grupvalue[2] -= 1
+			grupvalue[4] += 1
+		elseif pcs_makeup = 5:
+			grupvalue[1] += 3
+		elseif pcs_makeup = 6:
+			grupvalue[1] -= 3
+			grupvalue[2] -= 5
+		end
+	end
+
 	if NikoVolkovQW = 5 and NikoEv = 7 and NikoDate_Day ! daystart: gt 'NikoDates', 'Disco'
 
 	if hour >= 20 and hour <= 23:
-
+		'<center><b><font color="maroon">Disco</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 		if LariskaQW['story'] = 14: 'You think you see <a href="exec: gt ''lariska_storyline'', ''Boyfriend_5''">someone</a> you know on the dance floor.'
 
 		act 'Go outside': gt 'pav_commcenter'
 
 		act 'Go to the toilets': gt 'gdktoilet', 'start'
 
-		if StoryLine = 1 and SchoolAtestat = 0: 'At the disco you see a few of your <a href="exec: gt ''gdkin'', ''classmates''">classmates</a>. Some of them dancing, while others stick to their own groups and talk.'
+		if StoryLine = 1 and SchoolAtestat = 0: 'At the disco you see a few of your <a href="exec: gt ''pav_disco_coolkids'', ''classmates''">classmates</a>. Some of them dancing, while others stick to their own groups and talk.'
 		if soniaslut < 5: soniaslut += 1
 
 		if dimaRevenge = 7 and dimaRevChoice = 4 and dimadisco = 0: gt 'dimaRevenge', 5, 'disco'
 
-		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart and SchoolAtestat = 0:
+		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart and SchoolAtestat = 0 and month > 9:
 			if npc_grupTipe['A25'] ! 5 and StoryLine = 1 and BeInSchool > 0 and soniaslut >= 5 and hour < 23:
 				'You notice Sonia talking to Vitek about something.'
 				act 'Watch Sonia': soniadisco_day = daystart & gt 'soniadisco', 'start'
 			end
 		end
-
 		act 'Dance (0:15)':
 			*clr & cla
 			menu_off = 1
 			'<center><b><font color="maroon">Disco</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
 			if pcs_inhib < 40:inhib_exp += rand(1,2)
 			if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
-				gdkincum = daystart
+				pav_discocum = daystart
 				gs 'fame', 'pav', 'sex', 5
 				pcs_mood -= 40
 				gs 'stat'
-				
+				'<center><b><font color="maroon">Disco</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/cumface1.jpg"></center>'
 				'As you head out on the dance floor, a guy walks up to you, notices the cum still splattered on you and points at you. "Check out this cocksucker! Hey guys, this chick has cum smeared all over her face!" The ones standing near him come closer. "Did you forget to swallow, slut?" Your cheeks blush with shame and you quickly head for the exit.'
-
 				act 'Leave': gt 'pav_commcenter'
 			else
 				minut += 15
@@ -73,70 +107,202 @@ if $ARGS[0] = '':
 				gs 'sweat', 'add', 3
 				fat -= 1
 				danc_exp += 1
-
 				pcs_mood += 10
 				frost = 0
 				gs 'stat'
-
-				if rand(0,7) = 1 and katja_disco_end=1 and (alko > 1 or pcs_horny => 80) and KatjaHorny > 60:
-					*clr
+				if alko = 0:
 					'<center><b><font color="maroon">Disco</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance.jpg"></center>'
-					'While you are dancing you notice Katya out on the dance floor as well.'
-					act 'Dance with Katya': gt 'gdkin', 'Katja_dance'
-				end
-
-				if alko >= 6:
-					'You''re too drunk to try and dance. You are barely able to stay on your feet and are mostly just drunkenly bumping into other people as you try and dance.'
-					if StoryLine = 1 and SchoolAtestat = 0 and meynoldQW >= 2 and rand(0,1) = 0: gt 'gdkin', 'too_drunk_dance'
-				elseif alko > 3:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/dance.jpg"></center>'
 					if $pantyworntype = 'none' and PCloSkirt > 2:
-						*clr
-						'<center><b><font color="maroon">Disco</font></b></center>'
-						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/club_dance2.mp4"></video></center>'
-						'You''re drunk and you forget that you don''t have any panties on. As you dance around moving your body, your skirt rides up, exposing your pussy to the observant people on the dance floor with you.'
+						gs 'inhibition', 1
+						'You look around and smile, as no one know you are not wearing any panties. You feel a thrilling sensation rush through your body as you think about it.'
+					end
+					if pcs_danc <= 30:
+						grupvalue[1] -= 1
+						grupvalue[2] -= 2
+						'You''re having a lot of fun out on the dance floor anyways. As you dance around horribly, you move your body around making it look like you are having some sort of attack, you''re not even paying attention to anyone else or even the music.'
+					elseif pcs_danc <= 60:
+						'You''re having a lot of fun out on the dance floor anyways. As you dance around moving your body, you''re not even paying attention to anyone else or even the music.'
+					elseif pcs_dancero <= 40:
+						grupvalue[1] += 1
+						grupvalue[2] += 1
+						'You''re having a lot of fun out on the dance floor anyways. You move your body around in a erotic manner, you''re not even paying attention to anyone else or even the music.'
 					else
-						*clr
-						'<center><b><font color="maroon">Disco</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance7.jpg"></center>'
-						'You''re drunk, but you''re having a lot of fun out on the dance floor anyways. You''re not even paying attention to anyone else or even the music.'
+						grupvalue[1] += 2
+						grupvalue[2] += 2
+						'You''re having a lot of fun out on the dance floor anyways. You move your body around expertly in a seductive manner, you''re not even paying attention to anyone else or even the music.'
+					end
+				elseif alko = 1:
+					'<center><b><font color="maroon">Disco</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/tipsy_dance.jpg"></center>'
+					if $pantyworntype = 'none' and PCloSkirt > 2:
+						gs 'inhibition', 1
+						'You look around and smile, as no one know you are not wearing any panties. You feel a thrilling sensation rush through your body as you think about it.'
+					end
+					if pcs_danc <= 30:
+						grupvalue[1] -= 1
+						grupvalue[2] -= 2
+						'You''re having a lot of fun out on the dance floor anyways. As you dance around horribly, being buzzed doesn''t help but you are just a bad dancer. You move your body around making it look like you are having some sort of attack, you''re not even paying attention to anyone else or even the music.'
+					elseif pcs_danc <= 60:
+						'You''re having a lot of fun out on the dance floor anyways. As you dance around moving your body, you''re not even paying attention to anyone else or even the music.'
+					elseif pcs_dancero <= 40:
+						grupvalue[1] += 1
+						grupvalue[2] += 1
+						'You''re having a lot of fun out on the dance floor anyways. Despite this you dance pretty well for how buzzed you are, as you move your body around in a erotic manner, you''re not even paying attention to anyone else or even the music.'
+					else
+						grupvalue[1] += 2
+						grupvalue[2] += 2
+						'You''re having a lot of fun out on the dance floor anyways. By how well you are dancing most people would have a hard time knowing you was buzzed, you move your body around expertly in a seductive manner, you''re not even paying attention to anyone else or even the music.'
+					end
+				elseif alko < 4:
+					'<center><b><font color="maroon">Disco</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/tipsy_dance.jpg"></center>'
+					if $pantyworntype = 'none' and PCloSkirt > 2:
+						gs 'inhibition', 1
+						'You look around and smile, as no one know you are not wearing any panties. You feel a thrilling sensation rush through your body as you think about it.'
+					end
+					if pcs_danc <= 30:
+						grupvalue[1] -= 1
+						grupvalue[2] -= 2
+						'You''re having a lot of fun out on the dance floor anyways. As you dance around horribly, being tipsy doesn''t help but you are just a bad dancer. You move your body around making it look like you are having some sort of attack, you''re not even paying attention to anyone else or even the music.'
+					elseif pcs_danc <= 60:
+						'You''re having a lot of fun out on the dance floor anyways. As you dance around moving your body, you''re not even paying attention to anyone else or even the music.'
+					elseif pcs_dancero <= 40:
+						grupvalue[1] += 1
+						grupvalue[2] += 1
+						'You''re having a lot of fun out on the dance floor anyways. Despite this you dance pretty well for how tipsy you are, as you move your body around in a erotic manner, you''re not even paying attention to anyone else or even the music.'
+					else
+						grupvalue[1] += 2
+						grupvalue[2] += 2
+						'You''re having a lot of fun out on the dance floor anyways. By how well you are dancing most people would have a hard time knowing you was tipsy, you move your body around expertly in a seductive manner, you''re not even paying attention to anyone else or even the music.'
+					end
+				elseif alko < 6:
+					'<center><b><font color="maroon">Disco</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/drunk_dance.jpg"></center>'
+					if $pantyworntype = 'none' and PCloSkirt > 2:
+						gs 'inhibition', 1
+						'You look around and smile, as no one know you are not wearing any panties. You feel a thrilling sensation rush through your body as you think about it.'
 					end
-				elseif alko > 0:
+					if pcs_danc <= 30:
+						grupvalue[1] -= 3
+						grupvalue[2] -= 3
+						grupvalue[4] += 1
+						'You''re having a lot of fun out on the dance floor anyways. As you dance around horribly, being drunk doesn''t help but you are just a bad dancer. You move your body around making it look like you are having some sort of attack, you''re not even paying attention to anyone else or even the music.'
+					elseif pcs_danc <= 60:
+						grupvalue[1] -= 2
+						grupvalue[2] -= 2
+						grupvalue[4] += 1
+						'You''re having a lot of fun out on the dance floor anyways. As you dance around moving your body, you''re not even paying attention to anyone else or even the music.'
+					elseif pcs_dancero <= 40:
+						grupvalue[1] -= 1
+						grupvalue[2] -= 1
+						grupvalue[4] += 1
+						'You''re having a lot of fun out on the dance floor anyways. Despite this you dance pretty well for how drunk you are, as you move your body around in a erotic manner, you''re not even paying attention to anyone else or even the music.'
+					else
+						grupvalue[4] += 1
+						'You''re having a lot of fun out on the dance floor anyways. By how well you are dancing most people would have a hard time knowing you was drunk, you move your body around expertly in a seductive manner, you''re not even paying attention to anyone else or even the music.'
+					end
+!!can you check I did this correct and all the other similar ones? 
+					if StoryLine = 1 and meynoldQW >= 2 and rand(1,10) = 1: 
+						gt 'pav_disco', 'katja_too_drunk'
+					elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
+						gt 'pav_disco', 'sonia_too_drunk' 
+					elseif npc_rel['A144'] >= 50 and rand(1,10) = 1: 
+						gt 'pav_disco', 'anushka_too_drunk'
+					end
+				elseif alko < 10:
 					if $pantyworntype = 'none' and PCloSkirt > 2:
-						*clr
+						*clr & cla
+						gs 'inhibition', 3
 						'<center><b><font color="maroon">Disco</font></b></center>'
-						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/club_dance2.mp4"></video></center>'
-						'You''re a bit tipsy and you forget that you don''t have any panties on. As you dance around moving your body, your skirt rides up, exposing your pussy to the observant people on the dance floor.'
+						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/very_drunk_dance.mp4"></video></center>'
+						if pcs_danc <= 30:
+							grupvalue[1] -= 6
+							grupvalue[2] -= 6
+							grupvalue[4] += 2
+							'You''re very drunk and you forget that you don''t have any panties on. As you dance around horribly, being very drunk doesn''t help but you are just a bad dancer. You move your body around making it look like you are having some sort of attack, your skirt rides up, exposing your pussy to the observant people on the dance floor with you.'
+						elseif pcs_danc <= 60:
+							grupvalue[1] -= 5
+							grupvalue[2] -= 5
+							grupvalue[4] += 2
+							'You''re very drunk and you forget that you don''t have any panties on. As you dance around moving your body, your skirt rides up, exposing your pussy to the observant people on the dance floor with you.'
+						elseif pcs_dancero <= 40:
+							grupvalue[1] -= 4
+							grupvalue[2] -= 4
+							grupvalue[4] += 2
+							'You''re very drunk and you forget that you don''t have any panties on. Despite this you dance pretty well for how drunk you are, as you move your body around in a erotic manner, your skirt rides up, exposing your pussy to the observant people on the dance floor with you.'
+						else
+							grupvalue[1] -= 3
+							grupvalue[2] -= 3
+							grupvalue[4] += 2
+							'You''re very drunk and you forget that you don''t have any panties on. By how well you are dancing most people would have a hard time knowing you was very drunk, you move your body around expertly in a seductive manner, but you are to drunk to notice as your skirt rides up, exposing your pussy to the observant people on the dance floor with you.'
+						end
+						if StoryLine = 1 and meynoldQW >= 2 and rand(1,5) = 1: 
+							gt 'pav_disco', 'katja_too_drunk'
+						elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
+							gt 'pav_disco', 'sonia_too_drunk' 
+						elseif npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+							gt 'pav_disco', 'anushka_too_drunk'
+						end
 					else
-						*clr
+						*clr & cla
 						'<center><b><font color="maroon">Disco</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance7.jpg"></center>'
-						'You''re a bit tipsy, but you''re having a lot of fun out on the dance floor anyways. You''re not paying much attention to anyone else or even the music.'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/very_drunk_dance.jpg"></center>'
+						'You''re very drunk, but you''re having a lot of fun out on the dance floor anyways. You''re not even paying attention to anyone else or even the music.'
+						if pcs_danc <= 30:
+							grupvalue[1] -= 4
+							grupvalue[2] -= 4
+							'You''re very drunk, but you''re having a lot of fun out on the dance floor anyways. As you dance around horribly, being drunk doesn''t help but you are just a bad dancer. You move your body around making it look like you are having some sort of attack, you''re not even paying attention to anyone else or even the music.'
+						elseif pcs_danc <= 60:
+							grupvalue[1] -= 3
+							grupvalue[2] -= 3
+							'You''re very drunk, but you''re having a lot of fun out on the dance floor anyways. As you dance around moving your body, you''re not even paying attention to anyone else or even the music.'
+						elseif pcs_dancero <= 40:
+							grupvalue[1] -= 2
+							grupvalue[2] -= 2
+							'You''re very drunk, but you''re having a lot of fun out on the dance floor anyways. Despite this you dance pretty well for how drunk you are, as you move your body around in a erotic manner, you''re not even paying attention to anyone else or even the music.'
+						else
+							grupvalue[1] -= 1
+							grupvalue[2] -= 1
+							'You''re very drunk, but you''re having a lot of fun out on the dance floor anyways. By how well you are dancing most people would have a hard time knowing you was drunk, you move your body around expertly in a seductive manner, you''re not even paying attention to anyone else or even the music.'
+						end
+						if StoryLine = 1 and meynoldQW >= 2 and rand(1,5) = 1: 
+							gt 'pav_disco', 'katja_too_drunk'
+						elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
+							gt 'pav_disco', 'sonia_too_drunk' 
+						elseif npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+							gt 'pav_disco', 'anushka_too_drunk'
+						end
 					end
 				else
-					'The music is quite old, but catchy. You have fun dancing, not paying attention to anyone.'
+					grupvalue[1] -= 5
+					grupvalue[2] -= 5
+					grupvalue[4] -= 1
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wasted_dance.jpg"></center>'
+					'You''re too drunk to try and dance. You are barely able to stay on your feet and are mostly just drunkenly bumping into other people as you try and dance.'
+					if StoryLine = 1 and meynoldQW >= 2 and rand(1,3) = 1: 
+						gt 'pav_disco', 'katja_too_drunk'
+					elseif npc_rel['A25'] >= 50 and rand(1,5) = 1:
+						gt 'pav_disco', 'sonia_too_drunk' 
+					elseif npc_rel['A144'] >= 50 and rand(1,5) = 1: 
+						gt 'pav_disco', 'anushka_too_drunk'
+					end
 				end
-
 				if alko < 6:
 					verprigrand = rand(0, 100)
-
 					if verprigrand <= pcs_danc:
-						gs 'gdkin', 'dance_partner'
+						gs 'pav_disco', 'dance_partner'
 						gs 'stat'
 						'<<$din_disc_dance2>>'
-
-						act 'Move away': gt 'gdkin'
-						act 'Dance with the guy': gt 'gdkin', 'dance_vrp'
+						act 'Move away': gt 'pav_disco'
+						act 'Dance with the guy': gt 'pav_disco', 'dance_vrp'
 						exit
 					end
 				end
-
 				gs 'stat'
-
-				act 'Continue': gt 'gdkin'
+				act 'Continue': gt 'pav_disco'
 			end
 		end
-
 		act 'Stand at the wall':
 			*clr & cla
 			menu_off = 1
@@ -146,162 +312,94 @@ if $ARGS[0] = '':
 			frost = 0
 			gs 'stat'
 			'<center><b><font color="maroon">Disco</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_yaho.jpg"></center>'
-
 			if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
-				gdkincum = daystart
+				pav_discocum = daystart
 				gs 'fame', 'pav', 'sex', 5
 				pcs_mood -= 40
 				gs 'stat'
-				
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/cumface1.jpg"></center>'
 				'While standing by the wall, a guy notices cum on your clothes and he points and shouts. "This chick is covered in cum! Did you forget to swallow slut?" he says mockingly while laughing. Your cheeks blush with shame and you head for the exit.'
-
 				act 'Leave': gt 'pav_commcenter'
-
 				exit
 			end
-
-			if alko >= 6 and rand(1, 100) < 3:	gt 'gevent', '6'
-
-			if alko >= 6:
-				'You''re too drunk to dance and you lean against the wall for support to stop yourself from falling.'
-				if StoryLine = 1 and SchoolAtestat = 0 and meynoldQW >= 2 and rand(0,1) = 0: gt 'gdkin', 'too_drunk_dance'
-			elseif alko > 3:
-				'You''re drunk and stand against the wall, watching the others dance.'
-			elseif alko > 0:
-				'You''re tipsy and stand against the wall, watching the others dance.'
+			if alko > 0:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wallflower.jpg"></center>'
+				elseif alko = 1:
+					'You''re buzzed and stand against the wall, watching the others dance.'
+				elseif alko < 4:
+					'You''re tipsy and stand against the wall, watching the others dance.'
+				elseif alko < 6:
+					if StoryLine = 1 and meynoldQW >= 2 and rand(1,10) = 1: 
+						gt 'pav_disco', 'katja_too_drunk'
+					elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
+						gt 'pav_disco', 'sonia_too_drunk' 
+					elseif npc_rel['A144'] >= 50 and rand(1,10) = 1: 
+						gt 'pav_disco', 'anushka_too_drunk'
+					else
+						'You''re pretty drunk and stand against the wall, for support, as you watch the others dance.'
+				elseif alko < 10:
+					if StoryLine = 1 and meynoldQW >= 2 and rand(1,5) = 1: 
+						gt 'pav_disco', 'katja_too_drunk'
+					elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
+						gt 'pav_disco', 'sonia_too_drunk' 
+					elseif npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+						gt 'pav_disco', 'anushka_too_drunk'
+					else
+						'You''re too drunk to dance and you lean against the wall for support to stop yourself from falling.'
+				else
+					if StoryLine = 1 and meynoldQW >= 2 and rand(1,3) = 1: 
+						gt 'pav_disco', 'katja_too_drunk'
+					elseif npc_rel['A25'] >= 50 and rand(1,5) = 1:
+						gt 'pav_disco', 'sonia_too_drunk' 
+					elseif npc_rel['A144'] >= 50 and rand(1,5) = 1: 
+						gt 'pav_disco', 'anushka_too_drunk'
+					else
+						'You''re too wasted to dance or stand, you have to lean against the wall for support to stop yourself from falling.'
+					end
+				end
 			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wallflower.jpg"></center>'
 				'You are standing next to the wall while watching the others dance.'
 			end
-
 			if alko < 6:
 				verodance = 0
-
 				if pcs_hairbsh = 1:verodance += 1
 				if PCloSkirt > 2 or PCloPants > 4:verodance += 1
 				if $clothingworntype = 'fashionista':verodance += 2
 				if pcs_makeup = 2:verodance += 1
 				if pcs_makeup = 3:verodance += 2
 				if pcs_makeup = 4:verodance += 3
-
 				verodance += alko
 				verodance += 5
 				verprigrand = rand(0, 20)
-
 				if verprigrand <= verodance:
-					gs 'gdkin', 'dance_partner'
+					gs 'pav_disco', 'dance_partner'
 					gs 'stat'
 					'<<$din_disc_dance>>'
-
-					act 'Refuse': gt 'gdkin'
-					act 'Dance': gt 'gdkin', 'dance_vrp'
+					act 'Refuse': gt 'pav_disco'
+					act 'Dance': gt 'pav_disco', 'dance_vrp'
 					exit
 				end
 			end
-
 			gs 'stat'
-
-			act 'Continue': gt 'gdkin'
+			act 'Continue': gt 'pav_disco'
 		end
-		if StoryLine = 1 and SchoolAtestat = 0: act 'Look for your classmates': gt 'gdkin', 'classmates'
+		if StoryLine = 1 and SchoolAtestat = 0: act 'Look for your classmates': gt 'pav_disco_coolkids', 'classmates'
 	elseif hour < 20:
+		'<center><b><font color="maroon">Disco</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/closing.jpg"></center>'
 		'The club closes. The main lights go on, the music fades and everyone begins to leave.'
 		act 'Go outside': gt 'pav_commcenter'
 	end
 end
 
-if $ARGS[0] = 'Katja_dance':
-	minut += 15
-	menu_off = 1
-	gs 'stat'
-	*clr & cla
-	dancerand = rand(1,5)
-	if $pantyworntype = 'none':
-	'<center><b><font color="maroon">Disco</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_2.jpg"></center>'
-		inhib_exp += rand(1,2)
-		'You dance with Katja, attracting views of guys from across the room. When you remember that you aren''t wearing panties, and your occasional spiraling of your skirt shows that fact off, it helps explain the attention.'
-	else
-		if pcs_inhib < 40:inhib_exp += rand(1,2)
-		'<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.'
-	end
-	act 'Expose Katja':
-		KatjaHorny += 20
-		*clr & cla
-		if dancerand = 1:
-			'<center><b><font color="maroon">Disco</font></b></center>'
-			'<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 'stat'
-			act 'Dance on':
-				*clr & cla
-				'<center><b><font color="maroon">Disco</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance2_1.jpg"></center>'
-				'One of the guys dancing moves in closer. Unable to stand watching the two of you dancing and touching each other like that, he slides his hand under her skirt.'
-				act 'Stick out tongue':
-					*clr & cla
-					'<center><b><font color="maroon">Disco</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_3.jpg"></center>'
-					'Rebuffing the guy, you and Katja push him away and turn to the crowd of guys around you. Katja hugs you and sticks her tongue out at the guys. The rebuffed guy looks around and thinks better of it, getting lost among the other dancers.'
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Move on': gt 'gdkin'
-				end
-			end
-		elseif dancerand = 2:
-			'<center><b><font color="maroon">Disco</font></b></center>'
-			'<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 boobs 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 '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 '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 '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 Katya, paying little attention to what is 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 'stat'
-		end
-		act 'Stick out tongue':
-			*clr & cla
-			'<center><b><font color="maroon">Disco</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_3.jpg"></center>'
-			'Looking at the crowd of guys around you, you hug Katja and stick out your tongue at them, letting them know they can look at you all they want, but that''s all they''re going to get.'
-			gs 'arousal', 'end'
-			gs 'stat'
-			act 'Move on': gt 'gdkin'
-		end
-	end
-end
-
 if $ARGS[0] = 'kotov_love':
-	cls
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Disco</font></b></center>'
-	'<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
 	'Vitek walks up to you and the guy. "What''s this? Who''s this guy?" Vitek shoves the guy and angrily says "Well? Who the fuck are you? This is my girl, you want me to bust you up?"'
-
 	if DPgrup = 1:
 		fightboyrand = rand(0, 10)
 
@@ -317,16 +415,17 @@ if $ARGS[0] = 'kotov_love':
 	elseif DPgrup = 2:
 		'The guy has a smug look on his face as he calls over his friends, who all come over to crowd around Vitek. "Real tough guy huh?" Vitek''s friends come over to back him up. After a bit of tough talk and a bit of shoving, the two groups break apart peacefully, going their own ways.'
 	elseif DPgrup = 3:
-		'The guy throws up his hands. "Sorry young man, I didn''t know she was with you." Vitek pushes the guy. "Go back to the city and stay there."'
+		'The guy throws up his hands. "Sorry man, I didn''t know she was with you." Vitek pushes the guy. "Go back to the city and stay there."'
 	end
-
 	act 'Go to Vitek':numnpc = 9 & gt 'Snpc'
-
 	exit
 end
 
 if $ARGS[0] = 'reakt_dance':
+	*clr & cla
 	menu_off = 1
+	'<center><b><font color="maroon">Disco</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance1.jpg"></center>'
 	if alko >= 3:
 		'You feel yourself getting aroused by the guy''s actions.'
 		gs 'arousal', 'foreplay', 5
@@ -334,16 +433,17 @@ if $ARGS[0] = 'reakt_dance':
 		gs 'stat'
 	else
 		if pcs_horny > 0:pcs_horny -= 5
-
 		pcs_mood -= 5
 		'You feel disgusted by the guy''s actions.'
 	end
-
 	gs 'stat'
 end
 
 if $ARGS[0] = 'reverse_reakt_dance':
+	*clr & cla
 	menu_off = 1
+	'<center><b><font color="maroon">Disco</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance1.jpg"></center>'
 	if alko < 3:
 		pcs_mood += 20
 		'You enjoy dancing with him a great deal.'
@@ -353,17 +453,13 @@ if $ARGS[0] = 'reverse_reakt_dance':
 		gs 'stat'
 	elseif alko > 3:
 		if pcs_horny > 0:pcs_horny -= 5
-
 		pcs_mood -= 5
 		'You find the guy boring and uninteresting.'
 	end
-
 	gs 'stat'
 end
 
 if $ARGS[0] = 'dance_vrp':
-	gs 'npcgeneratec', 0, 'Stranger', rand((age - 1),(age + 1)), 1
-	gs 'boyStat', $npclastgenerated
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -371,67 +467,68 @@ if $ARGS[0] = 'dance_vrp':
 	if pcs_inhib < 40: inhib_exp += rand(1,2)
 	gs 'stat'
 	'<center><b><font color="maroon">Disco</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance1.jpg"></center>'
 	'You accept the offer and the guy takes you by the hand and leads you out onto the dance floor, where you start dancing together.'
-
 	if DPgrup = 1:
 		if DPtipe = 1:
+			'<center><b><font color="maroon">Disco</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance3.jpg"></center>'
 			'The guy is dancing with you, holding your waist with his hands.'
-			gs 'gdkin', 'reverse_reakt_dance'
+			gs 'pav_disco', 'reverse_reakt_dance'
 		elseif DPtipe = 2:
 			*clr
 			'<center><b><font color="maroon">Disco</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance6.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance2.jpg"></center>'
 			'The drunk guy pushes into you, grinding his body up against yours. You feel your soft breasts literally flatten against the man''s chest.'
 			gs 'arousal', 'foreplay', 5
 			gs 'stat'
-			gs 'gdkin', 'reakt_dance'
+			gs 'pav_disco', 'reakt_dance'
 		end
 	elseif DPgrup = 2:
 		if DPtipe = 1:
+			'<center><b><font color="maroon">Disco</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance3.jpg"></center>'
 			'The guy slides his hands down your side to your hips.'
 			gs 'arousal', 'foreplay', 5
 			gs 'stat'
-			gs 'gdkin', 'reakt_dance'
+			gs 'pav_disco', 'reakt_dance'
 		elseif DPtipe = 2:
 			*clr
 			'<center><b><font color="maroon">Disco</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance8.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance4.jpg"></center>'
 			'The guy grabs your ass and squeezes it before he pulls you into a hug and kisses you passionately.'
 			gs 'arousal', 'foreplay', 5
 			gs 'stat'
-			gs 'gdkin', 'reakt_dance'
+			gs 'pav_disco', 'reakt_dance'
 		end
 	elseif DPgrup = 3:
 		if DPtipe = 1:
+			'<center><b><font color="maroon">Disco</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance2.jpg"></center>'
 			'A very confident and elegant man leads you in a dance, holding you by your waist with his strong hands.'
 			gs 'arousal', 'foreplay', 5
 			gs 'stat'
-			gs 'gdkin', 'reverse_reakt_dance'
+			gs 'pav_disco', 'reverse_reakt_dance'
 		elseif DPtipe = 2:
+			'<center><b><font color="maroon">Disco</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance4.jpg"></center>'
 			'A tipsy man hugs you around your waist and his hands go down to grab your ass.'
 			gs 'arousal', 'foreplay', 5
 			gs 'stat'
-			gs 'gdkin', 'reakt_dance'
+			gs 'pav_disco', 'reakt_dance'
 		end
 	end
-
-	act 'Stop and move away': gt 'gdkin'
-
+	act 'Stop and move away': gt 'pav_disco'
 	act 'Continue to dance with him':
 		*clr & cla
 		gs 'stat'
 		'<center><b><font color="maroon">Disco</font></b></center>'
-		if $pantyworntype = 'none' and alko >= 3 and PCloSkirt > 2:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance9.jpg"></center>'
-		elseif alko > 0:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance10.jpg"></center>'
+		if $pantyworntype = 'none':
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance5.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-		end
-
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance6.jpg"></center>'
 		if alko < 6 or pcs_horny <= 75:
-			act 'Refuse':gt 'gdkin'
+			act 'Refuse':gt 'pav_disco'
 		else
 			gs 'willpower', 'drink', 'resist'
 			if will_cost <= pcs_willpwr:
@@ -440,16 +537,15 @@ if $ARGS[0] = 'dance_vrp':
 					gs 'willpower', 'pay', 'resist'
 					if pcs_sprt <= 30: sprt_exp += rand(0,1)
 					gs 'stat'
-					gt 'gdkin'
+					gt 'pav_disco'
 				end
 			else
 				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-
 		if DPgrup = 1:
-			$npc_usedname[$npclastgenerated] = $npc_nickname[$npclastgenerated]
-			$boydesc = $npc_nickname[$npclastgenerated]
+			$npc_usedname[$npclastcalled] = $npc_nickname[$npclastcalled]
+			$boydesc = $npc_nickname[$npclastcalled]
 			if rand(1,2) = 1:
 				if DPtipe = 1:
 					'The guy told you during the dance "My name is <<$boydesc>>. What''s your name?" You answered "<<$pcs_nickname>>." Once the song ends, the guy asks you to sit with him and chat.'
@@ -464,8 +560,7 @@ if $ARGS[0] = 'dance_vrp':
 				elseif DPtipe = 2:
 					'The guy told you during the dance "My name is <<$boydesc>>. What''s your name?" You answered "<<$pcs_nickname>>." During the whole dance the drunk guy humped your body and now his face flushed with excitement. He asks you to leave the club and go get some fresh air, socialize, outside.'
 				end
-
-				act 'Go with the guy': gt'gdkin','hookup_nice'
+				act 'Go with the guy': gt'pav_disco','hookup_nice'
 			end
 		elseif DPgrup = 2:
 			if rand(1,2) = 1:
@@ -485,27 +580,25 @@ if $ARGS[0] = 'dance_vrp':
 					'For the entire dance the guy was grabbing your ass, breasts and kissing you, he was clearly excited. When you would press up against him, you could feel something hard in his pants. Finally the song ended and the guy asks if you want to go outside and get some fresh air?'
 					gs 'arousal', 'foreplay', 5
 					gs 'stat'
-					act 'Go with him': gt'gdkin','hookup_aggressive'
+					act 'Go with him': gt'pav_disco','hookup_aggressive'
 				elseif DPtipe = 2:
 					'For the entire dance the guy was grabbing your ass, breasts and kissing you, he was clearly excited. When you would press up against him, you could feel something hard in his pants. Finally the song ended and the guy asks if you want to go outside and get some fresh air?'
 					gs 'arousal', 'foreplay', 5
 					gs 'stat'
-					act 'Go with him': gt'gdkin','hookup_aggressive'
+					act 'Go with him': gt'pav_disco','hookup_aggressive'
 				end
 			end
 		elseif DPgrup = 3:
 			if DPtipe = 1:
 				'The man dances with confidence and elegance. When the song ends, he offers to go out for some fresh air and talk.'
-
 				act 'Go with the man':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
-					$npc_usedname[$npclastgenerated] = $npc_nickname[$npclastgenerated]
-					$boydesc = $npc_nickname[$npclastgenerated]
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/outside_talk.jpg"></center>'
+					$npc_usedname[$npclastcalled] = $npc_nickname[$npclastcalled]
+					$boydesc = $npc_nickname[$npclastcalled]
 					'You go outside with the man. As you walk, he put his arm around your waist. "My name is <<$boydesc>>. What''s your name?" he asks. "<<$pcs_nickname>>." you answer and the man continues. "<<$pcs_nickname>>, I''m in town on a business trip and I''m staying at a nearby hotel. There is virtually nothing to do in this town you know. Come back to my hotel with me and we can drink some whiskey while we sit and have a nice chat."'
-
-					if alko < 6 or pcs_horny <= 75 or fame['pav_slut'] <= 50:
+					if alko < 6 or pcs_horny <= 75 or pav_slut <= 50:
 						gs 'willpower', 'drink', 'resist'
 						if will_cost <= pcs_willpwr:
 							act 'Refuse (<<will_cost>> Willpower)':
@@ -513,45 +606,24 @@ if $ARGS[0] = 'dance_vrp':
 								gs 'willpower', 'pay', 'resist'
 								if pcs_sprt <= 30: sprt_exp += rand(0,1)
 								gs 'stat'
-								gt 'gdkin'
+								gt 'pav_disco'
 							end
 						else
 							act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					end
-
 					act 'Go to the hotel': gt 'gdksex', 'hotel'
 				end
 			elseif DPtipe = 2:
-				$npc_usedname[$npclastgenerated] = $npc_nickname[$npclastgenerated]
-				$boydesc = $npc_nickname[$npclastgenerated]
+				$npc_usedname[$npclastcalled] = $npc_nickname[$npclastcalled]
+				$boydesc = $npc_nickname[$npclastcalled]
 				'The drunk man molests you for the entire dance. When the dance ends, he whispers in your ear. "My name is <<$boydesc>>. What''s your name?" You answer feeling somewhat disgusted. "<<$pcs_nickname>>." The man continues. "<<$pcs_nickname>>, I''m not a local. I''m staying in a nearby hotel, so let''s take a taxi and go to my room."'
 				gs 'arousal', 'foreplay', 5
 				gs 'stat'
 				act 'Go to the hotel': gt 'gdksex', 'hotel'
 			end
 		end
-
-		if kotovLoveQW > 0: gt 'gdkin', 'kotov_love'
-	end
-
-	if pcs_danc >= 50 and alko >= 3 and pcs_horny >= 50:
-		act 'Dance sexily':
-			*clr & cla
-			if $pantyworntype = 'none' and PCloSkirt > 2:
-				'<center><b><font color="maroon">Disco</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance4.jpg"></center>'
-				'Trying to move your body as erotically as possible, you lean forward while doing a complex dance move, completely forgetting that you''re not wearing panties. Now your dance partner knows as well and it seems he will likely never forget.'
-			else
-				'<center><b><font color="maroon">Disco</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance3.jpg"></center>'
-				'You are taking advantage of your ability to dance, your sexy moves causing your partner to stare at you. He seems stunned by how great you look, or maybe by how well you move, but either way he suddenly moves away and disappears into the crowd.'
-			end
-			danc_exp += 1
-			gs 'arousal', 'flash', 5
-			gs 'stat'
-			act 'Continue': gt 'gdkin'
-		end
+		if kotovLoveQW > 0: gt 'pav_disco', 'kotov_love'
 	end
 end
 
@@ -560,7 +632,6 @@ if $ARGS[0] = 'dance_partner':
 	sozboyrand = rand(1,300)
 	if sozboyrand > boynum:
 		gs 'npcgeneratec', 0, 'Stranger', rand((age - 1),(age + 1)), 1
-		gs 'boyStat', $npclastgenerated
 		DaPaTipeRand = rand(0,100)
 
 		if DaPaTipeRand < 70:
@@ -615,12 +686,12 @@ if $ARGS[0] = 'dance_partner':
 		gs 'boystat', $npclastsaved
 		gs 'boymass', 'A'
 	elseif sozboyrand <= boynum:
-		gt 'gdkin', 'familiar'
+		gt 'pav_disco', 'familiar'
 	end
 end
 
 if $ARGS[0] = 'familiar':
-	cls
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 
@@ -630,186 +701,145 @@ if $ARGS[0] = 'familiar':
 		$niknameboy = 'Guy'
 		rudeboy = 1
 		'<center><b><font color="maroon">Disco</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/normal3.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/normal1.jpg"></center>'
 		'A man dressed in jeans and a T-shirt invites you to dance. You don''t recognize him, but he seems familiar.'
 	elseif bmTip[Tboynum] = 1:
 		$niknameboy = 'Gopnik'
 		rudeboy = 2
 		'<center><b><font color="maroon">Disco</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/gopnik3.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/gopnik1.jpg"></center>'
 		'A man dressed in sweatpants and sweatshirts invites you to dance. You don''t recognize him, but he seems familiar.'
 	elseif bmTip[Tboynum] = 2:
 		$niknameboy = 'Man'
 		rudeboy = 0
 		'<center><b><font color="maroon">Disco</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/suit4.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/suit1.jpg"></center>'
 		'A man dressed in a nice suit and expensive shoes invites you to dance. You don''t recognize him, but he seems familiar.'
 	end
-
 	gs 'BMloc'
-
 end
 
-
-if $ARGS[0] = 'too_drunk_dance':
-	cls
+if $ARGS[0] = 'katja_too_drunk':
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Disco</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance_alco1.jpg"></center>'
-	'Katja approachs you. "<<$pcs_nickname>>, are you drunk? Let''s get you home, I''ll help you."'
-
-	act 'Go with Katja':
-		*clr & cla
-		'<center><b><font color="maroon">Disco</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-		minut += 15
-		if meynoldQW = 2:meynoldQW = 3
-
-		gs 'stat'
-		if home_owned[2] = 1:
-			'Katja takes you by the arm and helps you get home.'
-			act 'Go home': gt 'korrPar'
-		else
-			'Katja takes you by the hand and helps you get back to the apartment complex.'
-			act 'Continue': gt 'pav_complex', 'start'
-		end
-	end
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/katja_help.jpg"></center>'
+	'Katja approaches you. "<<$pcs_nickname>>, are you drunk? Let''s get you home, I''ll help you."'
+	act 'Go with Katja': gt 'pav_disco_coolkids', 'katja_walkhome'
 end
 
-if $ARGS[0] = 'classmates':
+if $ARGS[0] = 'sonia_too_drunk':
 	*clr & cla
-	$menu_loc = 'gschool_groups'
-	$menu_arg = 'disco'
 	menu_off = 1
-	gs 'themes', 'food_menu'
-
+	gs 'stat'
 	'<center><b><font color="maroon">Disco</font></b></center>'
-	*nl
-	
-	killvar '$pop_text'
-	killvar 'pop_count'
-	i = 1
-	'<center><table cellspacing="3">'
-	:discopop_loop
-		if pop_count = 6 : $pop_text += '<tr>'
-
-		if npc_grupTipe['A<<i>>'] = 1 and discoenable['A<<i>>'] = 1:
-			pop_count += 1
-			$pop_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npcGo['A<<i>>']
-		end
-		if pop_count< 6 and npc_grupTipe['A<<i>>'] = 1:
-			$pop_text += '</td>'
-		elseif pop_count = 6 and npc_grupTipe['A<<i>>'] = 1:
-			$pop_text +='</td></tr><tr>' & pop_count = 0
-		end
-		i += 1
-	if i <= aarraynumber:jump 'discopop_loop'
-
-	'<<$pop_text>>'
-	'</table></center>'
-	
-	killvar '$gop_text'
-	killvar 'gop_count'
-	i = 1
-	'<center><table cellspacing="3">'
-	:discogop_loop
-		if gop_count = 6 : $gop_text += '<tr>'
-
-		if npc_grupTipe['A<<i>>'] = 4 and discoenable['A<<i>>'] = 1:
-			gop_count += 1
-			$gop_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npcGo['A<<i>>']
-		end
-		if gop_count< 6 and npc_grupTipe['A<<i>>'] = 4:
-			$gop_text += '</td>'
-		elseif gop_count = 6 and npc_grupTipe['A<<i>>'] = 4:
-			$gop_text +='</td></tr><tr>' & gop_count = 0
-		end
-		i += 1
-	if i <= aarraynumber:jump 'discogop_loop'
-
-	'<<$gop_text>>'
-	'</table></center>'
-	
-	act 'Move away': gt $loc, $loc_arg
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
+	'Sonia approaches you and smiles. "<<$pcs_nickname>>, your pretty drunk. Let''s get you home, I''ll walk with you."'
+	act 'Go with Sonia': gt 'pav_disco_coolkids', 'sonia_walkhome'
+end
 
-	'<center>Most the cool kids are dancing while the gopniks are standing in the corner of the room, keeping to themselves.</center>'
-	if hour >= 21 and hour < 23 and week=5: '<center>At the entrance of the disco hall stands <a href="exec: gt ''VolleyTrenerSpeak''">Coach Mikhail Nikolayevich</a></center>'
-	'</table><center>'
+if $ARGS[0] = 'anushka_too_drunk':
+	*clr & cla
+	menu_off = 1
+	gs 'stat'
+	'<center><b><font color="maroon">Disco</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
+	'Anushka approaches you and pokes you in the side, which causes you to jerk away. Which in turn causes you to stumble, nearly falling, but Anushka catches you by the arm to help steady you. "Well you have partied pretty hard tonight, havn''t you <<$pcs_nickname>>? Maybe you even over did it a little huh. Let''s get you home, before some guy tries to take advantage of you."'
+	act 'Go with Anushka': gt 'pav_disco_gopniks', 'anushka_walkhome'
 end
 
 if $ARGS[0] = 'hookup_aggressive':
+	cla & *clr
+	gs 'fame', 'pav', 'sex', 1
 	gs 'npcpreservec', $npclastgenerated
-	'<center><img src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
+	'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 	'"Hey, let''s go back to my place and fuck!"'
-	act 'Sorry':
+	act 'Sorry no thanks':
 		cla & *clr
-		'<center><img src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
-		'"Oh, uhh, I uhh... I don''t know if I''m really up for that. Sorry..."'
+		'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
+		'"No thanks, I''m not interested in having a one night stand tonight."'
 		'"Huh?!" <<$boydesc>> looks at you with anger on his face. "After the way you were dancing with me and you''re not gonna give it up?"'
-		'You cringe as he yells at you before spitting at your shoes and walking away.'
+		'He makes a show of your rejection, hissing at you and spits on the ground, narrowly missing your shoes before stalking off. You roll your eyes waiting until he''s a bit of a distance away before leaving yourself.'
+		gs 'arousal', 'end'
 		act 'Leave':gt $loc, $metka
-		act 'Return to the dance':gt 'gdkin'
+		act 'Return to the dance':gt 'pav_disco'
 	end
 	
-	act 'No thanks':
+	act 'Fuck off':
 		cla & *clr
-		'<center><img src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
+		'<center><img src="images/pc/reactions/fuckoff3.jpg"></center>'
 		'"No thanks, I''m not interested in having a one night stand tonight."'
 		'"Huh?!" <<$boydesc>> looks at you with anger on his face. "After the way you were dancing with me and you''re not gonna give it up?"'
 		'He makes a show of your rejection, hissing at you and spits on the ground, narrowly missing your shoes before stalking off. You roll your eyes waiting until he''s a bit of a distance away before leaving yourself.'
+		gs 'arousal', 'end'
 		act 'Leave':gt $loc, $metka
-		act 'Return to the dance':gt 'gdkin'
+		act 'Return to the dance':gt 'pav_disco'
 	end
 	
 	act 'That sounds nice':
-		cla & *nl
+		cla & *clr
+		'<center><img src="images/locations/pavlovsk/community/disco/outside_kiss.jpg"></center>'
 		'"That sounds nice," you say, smiling at him.'
-		'"Great!" He grins back at you and grabs you by the arm to start towing you towards a nearby apartment complex, whispering obscenities in your ear along the way.'
+		'He leans in and starts kissing you, when he finally breaks the kiss he says. "Great!" He grabs you by the arm to start towing you towards a nearby apartment complex, whispering obscenities in your ear along the way.'
+		gs 'arousal', 'kiss', 5
+		gs 'arousal', 'end'
+		gs 'stat'
 		act 'Go to his place':gt 'hookup', 'start'
 	end
 	
 	act 'Fuck yeah':
-		cla & *nl
+		cla & *clr
+		'<center><img src="images/locations/pavlovsk/community/disco/outside_kiss.jpg"></center>'
 		'"Fuck yeah," you say back to him'
-		'"I knew I liked you," he says, grabbing you by the arm and towing you towards a nearby apartment complex.'
+		'He leans in and starts kissing you, when he finally breaks the kiss he says. "I knew I liked you," Grabbing you by the arm and towing you towards a nearby apartment complex.'
+		gs 'arousal', 'kiss', 5
+		gs 'arousal', 'end'
+		gs 'stat'
 		act 'Go to his place':gt 'hookup', 'start'
 	end
 end
 
 if $ARGS[0] = 'hookup_nice':
+	cla & *clr
 	gs 'npcpreservec', $npclastgenerated
-	'<center><img src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
+	'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 	'"Hey," <<$npc_firstname[$npclastsaved]>> says. "I had a really good time dancing with you tonight and I was wondering... would you maybe want to come back to my place? I could get you a drink and maybe..."'
 	act 'Sorry':
 		cla & *clr
-		'<center><img src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
+		'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 		'"Oh, uhh, I uhh... I don''t know if I''m really up for that. Sorry..."'
 		'"Oh, sure. That''s okay. You don''t have to be sorry."'
 		'<<$npc_firstname[$npclastsaved]>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I''ll see you here again."'
 		act 'Leave':gt $loc, $metka
-		act 'Return to the dance':gt 'gdkin'
+		act 'Return to the dance':gt 'pav_disco'
 	end
 	
 	act 'No thanks':
 		cla & *clr
-		'<center><img src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
+		'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 		'"No thanks, I''m not interested."'
 		'"Oh, sure. That''s okay. Uhh, sorry I asked."'
 		'You shrug and walk away.'
 		act 'Leave':gt $loc, $metka
-		act 'Return to the dance':gt 'gdkin'
+		act 'Return to the dance':gt 'pav_disco'
 	end
 	
 	act 'Wanna fuck?':
-		cla & *nl
+		cla & *clr
+		gs 'fame', 'pav', 'sex', 1
+		'<center><img src="images/locations/pavlovsk/community/disco/outside_kiss.jpg"></center>'
 		'"... fuck?" you ask.'
-		'"Uhh..."'
+		'He looks confused and dumb founded by your words. "Uhh..."'
 		'"Fuck," you repeat. "Wanna go back to your place and fuck? We can skip the drinks too."'
 		'<<$npc_firstname[$npclastsaved]>> seems stunned by your straightforwardness but eventually answers, "Yes!"'
-		'"Great! Lead the way!"'
+		'You lean in and kiss him passionately, he returns the kiss just as enthusiastically after a moment. Once you break the kiss you say. "Great! Lead the way!"'
 		'The two of you hurry through the streets together to a nearby apartment complex.'
+		gs 'arousal', 'kiss', 5
+		gs 'arousal', 'end'
+		gs 'stat'
 		act 'Go to his place':gt 'hookup', 'start'
 	end
 end
---- gdkin ---------------------------------
+
+--- pav_disco ---------------------------------

+ 11 - 11
locations/soniadisco.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'watchorhelp':
 		'You keep on watching as the boys are getting quite frisky as Sonia is barely putting up any resistance. The boys are truly all over her, touching her wherever they please as Sonia keeps on stumbling around, too drunk to care what is happening...'
 		'After a few minutes, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
 		'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
-		act 'Continue': gt 'gdkin'
+		act 'Continue': gt 'pav_disco'
 	end
 	act 'Help Sonia':
 		*clr & cla
@@ -66,7 +66,7 @@ if $ARGS[0] = 'watchorhelp':
 			'You just shake your head and walk away, leaving Sonia dancing around grinding on boys, and there is no shortage of boys trying to dance with her. She looks to be having fun, but she is also acting like a total slut, and you can see others watching and whispering about her.'
 			'After a few minutes, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
 			'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
-			act 'Continue': gt 'gdkin'
+			act 'Continue': gt 'pav_disco'
 		end
 		act 'Convince her':
 			*clr & cla
@@ -84,7 +84,7 @@ if $ARGS[0] = 'watchorhelp':
 			'She nods. "Thanks, yeah." She starts to head out, and you notice she can barely walk, but when you start to help her, she pulls away. "I can handle it myself."'
 			'You sigh a bit. "Just be careful with drinking too much and be careful walking home."'
 			'She rolls her eyes. "It was just a little harmless fun, no one cares." Then she walks away.'
-			act 'Continue': gt 'gdkin'
+			act 'Continue': gt 'pav_disco'
 		end
 	end
 end
@@ -104,7 +104,7 @@ if $ARGS[0] = 'soniashowsboobs':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/titflash.jpg"></center>'
 			'You keep on watching as Sonia, the top of her dress still pulled down and her boobs bouncing around freely, continues dancing, perhaps even more energetically than before. After a few minutes, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
 			'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
-			act 'Continue': gt 'gdkin'
+			act 'Continue': gt 'pav_disco'
 		end
 		act 'Help Sonia':
 			*clr & cla
@@ -122,7 +122,7 @@ if $ARGS[0] = 'soniashowsboobs':
 				'You just shake your head and walk away, leaving Sonia dancing around grinding on boys with her tits hanging out, and there is no shortage of boys trying to dance with her. She looks to be having fun, but she is also acting like a total slut, and you can see others watching and whispering about her.'
 				'After a while, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
 				'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
-				act 'Continue': gt 'gdkin'
+				act 'Continue': gt 'pav_disco'
 			end
 			act 'Convince her':
 				*clr & cla
@@ -138,7 +138,7 @@ if $ARGS[0] = 'soniashowsboobs':
 				'She smiles at you a bit. "Thanks <<$pcs_nickname>>, I guess I got a little carried away."'
 				'"Maybe you should go home, you''re pretty wasted," you reply to her.'
 				'She nods. "Yeah I guess I should, thanks again <<$pcs_nickname>>." She starts to head out.'
-				act 'Let her go': gt 'gdkin'
+				act 'Let her go': gt 'pav_disco'
 				act 'Offer to walk her home':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
@@ -280,7 +280,7 @@ if $ARGS[0] = 'dance':
 		'You just watch, and Sonia dances around grinding on boys. There is no shortage of boys trying to dance with her, and she looks to be having fun, but she is also acting like a total slut, and you can see others watching and whispering about her.'
 		'After a few minutes, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
 		'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
-		act 'Continue': gt 'gdkin'
+		act 'Continue': gt 'pav_disco'
 	end
 	act 'Approach Sonia':
 		*clr & cla
@@ -301,7 +301,7 @@ if $ARGS[0] = 'dance':
 			'She nods. "Thanks, yeah." She starts to head out, and you notice she can barely walk, so you help her outside. With the fresh air, she seems a little more stable. You could walk her home or go back to the disco.'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go back to dance': gt 'gdkin'
+			act 'Go back to dance': gt 'pav_disco'
 			act 'Walk her home': gt 'soniadisco', 'walkhome'
 		end
 		act 'Pull the other strap down too':
@@ -317,7 +317,7 @@ if $ARGS[0] = 'dance':
 			gs 'arousal', 'erotic_nudity', 10
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Continue': gt 'gdkin'
+			act 'Continue': gt 'pav_disco'
 		end
 	end
 end
@@ -668,7 +668,7 @@ if $ARGS[0] = 'dance1':
 	gs 'arousal', 'voyeur_sex', 5
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Ignore Sonia': gt 'gdkin'
+	act 'Ignore Sonia': gt 'pav_disco'
 	act 'Follow Sonia': gt 'soniadisco', 'followsonia'
 end
 	
@@ -827,7 +827,7 @@ if $ARGS[0] = 'followsonia':
 			act 'Leave': gt 'pav_residential'
 		end
 	end
-	act 'Go back to the disco': gt 'gdkin'
+	act 'Go back to the disco': gt 'pav_disco'
 end
 
 if $ARGS[0] = 'homesex':

+ 12 - 10
locations/stat_display.qsrc

@@ -1148,16 +1148,18 @@ if cheatStatusIcons = 0:
 
 	if $stat_drug_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_drug_msg"><img title="<<$stat_drug_msg>>" height = <<set_siconht>> src="images/system/icons/status/craving_drugs.png"></a></td>'
 
-	if alko > 0 and alko = 1:
-		$statusIconBarTab += '<td><a href="exec:msg ''You feel a little buzz from drinking.''"><img title="You feel a little buzz from drinking." height = <<set_siconht>> src="images/system/icons/status/alko_1.png"></a></td>'
-	elseif alko > 0 and alko < 4:
-		$statusIconBarTab += '<td><a href="exec:msg ''You are feeling a bit tipsy.''"><img title="You are feeling a bit tipsy." height = <<set_siconht>> src="images/system/icons/status/alko_2.png"></a></td>'
-	elseif alko > 0 and alko < 6:
-		$statusIconBarTab += '<td><a href="exec:msg ''You are drunk.''"><img title="You are drunk." height = <<set_siconht>> src="images/system/icons/status/alko_3.png"></a></td>'
-	elseif alko > 0 and alko < 10:
-		$statusIconBarTab += '<td><a href="exec:msg ''You are very drunk.''"><img title="You are very drunk." height = <<set_siconht>> src="images/system/icons/status/alko_4.png"></a></td>'
-	elseif alko > 0:
-		$statusIconBarTab += '<td><a href="exec:msg ''You are wasted.''"><img title="You are wasted." height = <<set_siconht>> src="images/system/icons/status/alko_4.png"></a></td>'
+	if alko > 0:
+		if alko = 1:
+			$statusIconBarTab += '<td><a href="exec:msg ''You feel a little buzz from drinking.''"><img title="You feel a little buzz from drinking." height = <<set_siconht>> src="images/system/icons/status/alko_1.png"></a></td>'
+		elseif alko < 4:
+			$statusIconBarTab += '<td><a href="exec:msg ''You are feeling a bit tipsy.''"><img title="You are feeling a bit tipsy." height = <<set_siconht>> src="images/system/icons/status/alko_2.png"></a></td>'
+		elseif alko < 6:
+			$statusIconBarTab += '<td><a href="exec:msg ''You are drunk.''"><img title="You are drunk." height = <<set_siconht>> src="images/system/icons/status/alko_3.png"></a></td>'
+		elseif alko < 10:
+			$statusIconBarTab += '<td><a href="exec:msg ''You are very drunk.''"><img title="You are very drunk." height = <<set_siconht>> src="images/system/icons/status/alko_4.png"></a></td>'
+		else
+			$statusIconBarTab += '<td><a href="exec:msg ''You are wasted.''"><img title="You are wasted." height = <<set_siconht>> src="images/system/icons/status/alko_4.png"></a></td>'
+		end
 	end
 
 	if mentats_dose >= 1: $statusIconBarTab += '<td><a href="exec:msg ''You feel sharp and focused.''"><img title="You feel sharp and focused." height = <<set_siconht>> src="images/system/icons/status/drugs.png"></a></td>'