Merge remote-tracking branch 'origin/master'

locations/Katja_nightclub.qsrc

@@ -12,113 +12,116 @@
 
 if $ARGS[0] = 'activity':
 	gs 'katja_meynold_schedule' 
-	!! This sets what Katja is doing if she is not with the player character
-	if katjaQW['disco_check_time'] + 600 < totminut:
-		katjaQW['disco_loc'] = 0
-	end
+
+	if locat['Katja'] = 53 and (katjaQW['know_katja_uni'] = 1 or ($start_type ! 'city_tg' and $start_type ! 'uni_tg')):
+		!! This sets what Katja is doing if she is not with the player character
+		if katjaQW['disco_check_time'] + 600 < totminut:
+			katjaQW['disco_loc'] = 0
+		end
 	
-	if katjaQW['disco_loc'] >= 3 and katjaQW['disco_loc'] <= 6: 
-		if katjaQW['disco_check_time'] + 30 < totminut:
-			katjaQW['disco_check_time'] = totminut
-			if (rand(1,15) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 and katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0) or (katjaQW['liberated'] and rand(0,3) = 0):
-				if katjaQW['disco_loc'] = 3 and rand(0,4) < 4:
-					!! Katja goes to a private room with the guy 
-					katjaQW['nightclub_private_room_boy'] = 1
-					katjaQW['disco_loc'] = 7
-				else
-					!! Katja leaves the club with whom she is dancing
-					katjaQw['alone_with_other_day'] = daystart
-					if katjaQW['disco_loc'] = 5:
-						gs 'katja_procedural', 'sex_set', 0, 1
-					elseif katjaQW['disco_loc'] = 6:
-						gs 'katja_procedural', 'sex_set', 2
+		if katjaQW['disco_loc'] >= 3 and katjaQW['disco_loc'] <= 6: 
+			if katjaQW['disco_check_time'] + 30 < totminut:
+				katjaQW['disco_check_time'] = totminut
+				if (rand(1,15) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 and katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0) or (katjaQW['liberated'] and rand(0,3) = 0):
+					if katjaQW['disco_loc'] = 3 and rand(0,4) < 4:
+						!! Katja goes to a private room with the guy 
+						katjaQW['nightclub_private_room_boy'] = 1
+						katjaQW['disco_loc'] = 7
 					else
-						gs 'katja_procedural', 'sex_set', 1
-					end
+						!! Katja leaves the club with whom she is dancing
+						katjaQw['alone_with_other_day'] = daystart
+						if katjaQW['disco_loc'] = 5:
+							gs 'katja_procedural', 'sex_set', 0, 1
+						elseif katjaQW['disco_loc'] = 6:
+							gs 'katja_procedural', 'sex_set', 2
+						else
+							gs 'katja_procedural', 'sex_set', 1
+						end
 					
-					if hour > 10:
-						locat['katja_rand2'] = daystart
+						if hour > 10:
+							locat['katja_rand2'] = daystart
+						else
+							locat['katja_rand2'] = daystart -1
+						end
+						locat['katja_save2'] = 54
+						locat['katja'] = locat['katja_save2']
+					end
+				else
+					if rand(0,4) = 0:
+						katjaQW['disco_loc'] = 2
+						katjaQW['drinks'] += rand(1,2)
+					elseif rand(0,4) =0:
+						katjaQW['disco_loc'] = 8
 					else
-						locat['katja_rand2'] = daystart -1
+						katjaQW['disco_loc'] = 1
 					end
-					locat['katja_save2'] = 54
-					locat['katja'] = locat['katja_save2']
 				end
-			else
-				if rand(0,4) = 0:
-					katjaQW['disco_loc'] = 2
-					katjaQW['drinks'] += rand(1,2)
-				elseif rand(0,4) =0:
+			end
+		elseif katjaQW['disco_loc'] = 2:
+			if katjaQW['disco_check_time'] + 15 < totminut:
+				katjaQW['disco_check_time'] = totminut
+					katjaQW['drinks'] += 1
+				if rand(0,8) = 0:
 					katjaQW['disco_loc'] = 8
 				else
 					katjaQW['disco_loc'] = 1
 				end
 			end
-		end
-	elseif katjaQW['disco_loc'] = 2
-		if katjaQW['disco_check_time'] + 15 < totminut:
-			katjaQW['disco_check_time'] = totminut
-				katjaQW['drinks'] += 1
-			if rand(0,8) = 0:
-				katjaQW['disco_loc'] = 8
-			else
-				katjaQW['disco_loc'] = 1
-			end
-		end
-	elseif katjaQW['disco_loc'] = 8
-		if katjaQW['disco_check_time'] + 15 < totminut:
-			katjaQW['disco_check_time'] = totminut
-			if rand(0,5) = 0:
-				katjaQW['disco_loc'] = 2
-			else
-				katjaQW['disco_loc'] = 1
+		elseif katjaQW['disco_loc'] = 8:
+			if katjaQW['disco_check_time'] + 15 < totminut:
+				katjaQW['disco_check_time'] = totminut
+				if rand(0,5) = 0:
+					katjaQW['disco_loc'] = 2
+				else
+					katjaQW['disco_loc'] = 1
+				end
 			end
-		end
-	elseif katjaQW['disco_loc'] = 7
-		if katjaQW['disco_check_time'] + 60 < totminut:
-			katjaQW['disco_check_time'] = totminut
-			if rand(0,4) = 0:
-				katjaQW['disco_loc'] = 8
-			elseif rand(0,5) = 0:
-				katjaQW['disco_loc'] = 2
-				katjaQW['drinks'] += 1
-			else
-				katjaQW['disco_loc'] = 1
+		elseif katjaQW['disco_loc'] = 7:
+			if katjaQW['disco_check_time'] + 60 < totminut:
+				katjaQW['disco_check_time'] = totminut
+				if rand(0,4) = 0:
+					katjaQW['disco_loc'] = 8
+				elseif rand(0,5) = 0:
+					katjaQW['disco_loc'] = 2
+					katjaQW['drinks'] += 1
+				else
+					katjaQW['disco_loc'] = 1
+				end
 			end
-		end
-	else
-		if katjaQW['disco_check_time'] + 15 < totminut:
-			katjaQW['disco_check_time'] = totminut
-			if rand(1,4) <= 3:
-				katjaQW['disco_loc'] = 1
-			elseif rand(0,5) = 0:
-				katjaQW['disco_loc'] = 2
-				katjaQW['drinks'] += 1
-			elseif rand(0,8) = 0:
-				katjaQW['disco_loc'] = 8
-			elseif rand(1,12) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 or (katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0 and rand(1,8) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10) or (katjaQW['liberated'] = 1 and rand(0,3) = 0): 
-				katjaQW['disco_loc'] = 3
-			elseif rand(1,12) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 or (katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0 and rand(1,8) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10) or (katjaQW['liberated'] = 1 and rand(0,3) = 0): 
-				katjaQW['disco_loc'] = rand(4,6)
+		else
+			if katjaQW['disco_check_time'] + 15 < totminut:
+				katjaQW['disco_check_time'] = totminut
+				if rand(1,4) <= 3:
+					katjaQW['disco_loc'] = 1
+				elseif rand(0,5) = 0:
+					katjaQW['disco_loc'] = 2
+					katjaQW['drinks'] += 1
+				elseif rand(0,8) = 0:
+					katjaQW['disco_loc'] = 8
+				elseif rand(1,12) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 or (katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0 and rand(1,8) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10) or (katjaQW['liberated'] = 1 and rand(0,3) = 0): 
+					katjaQW['disco_loc'] = 3
+				elseif rand(1,12) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 or (katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0 and rand(1,8) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10) or (katjaQW['liberated'] = 1 and rand(0,3) = 0): 
+					katjaQW['disco_loc'] = rand(4,6)
+				end
 			end
 		end
-	end
 
-	if $ARGS[1] = 'dance_floor':
-		if katjaQW['disco_loc'] = 1:
-			'You see <a href="exec: gt ''katja_nightclub'',''dance_approach''">Katja</a> on the dance floor, dancing alone.'
-		elseif katjaQW['disco_loc'] = 3:
-			'You see <a href="exec: gt ''katja_nightclub'',''dance_guy_approach''">Katja</a> on the dance floor, dancing with a guy.'
-		elseif katjaQW['disco_loc'] = 4:
-			!!'You see <a href="exec: gt ''katja_nightclub'',''dance_black_guy_approach''">Katja</a> on the dance floor, dancing with a black guy.'
-		elseif katjaQW['disco_loc'] = 5:
-			!!'You see <a href="exec: gt ''katja_nightclub'',''dance_girl_approach''">Katja</a> on the dance floor, dancing with a girl.'
-		elseif katjaQW['disco_loc'] = 6:
-			!!'You see <a href="exec: gt ''katja_nightclub'',''dance_two_guys''">Katja</a> on the dance floor, dancing with two guys.'
-		end
-	elseif $SRGS[1] = 'bar':
-		if katjaQW['disco_loc'] = 2:
-			'You see <a href="exec: gt ''katja_nightclub'',''bar_approach''">Katja</a> at the bar, talking with the bartender.'
+		if $ARGS[1] = 'dance_floor':
+			if katjaQW['disco_loc'] = 1:
+				'You see <a href="exec: gt ''katja_nightclub'',''dance_approach''">Katja</a> on the dance floor, dancing alone.'
+			elseif katjaQW['disco_loc'] = 3:
+				'You see <a href="exec: gt ''katja_nightclub'',''dance_guy_approach''">Katja</a> on the dance floor, dancing with a guy.'
+			elseif katjaQW['disco_loc'] = 4:
+				!!'You see <a href="exec: gt ''katja_nightclub'',''dance_black_guy_approach''">Katja</a> on the dance floor, dancing with a black guy.'
+			elseif katjaQW['disco_loc'] = 5:
+				!!'You see <a href="exec: gt ''katja_nightclub'',''dance_girl_approach''">Katja</a> on the dance floor, dancing with a girl.'
+			elseif katjaQW['disco_loc'] = 6:
+				!!'You see <a href="exec: gt ''katja_nightclub'',''dance_two_guys''">Katja</a> on the dance floor, dancing with two guys.'
+			end
+		elseif $ARGS[1] = 'bar':
+			if katjaQW['disco_loc'] = 2:
+				'You see <a href="exec: gt ''katja_nightclub'',''bar_approach''">Katja</a> at the bar, talking with the bartender.'
+			end
 		end
 	end
 end
@@ -131,7 +134,7 @@ if $ARGS[0] = 'dance_approach':
 		katjaQW['disco_met'] = totminut
 		gs 'npc_relationship', 'modify', 'A14', 'like'
 		if katjaQW['QWstage'] > 0 or npc_rel['A14'] > 70:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_talking_on_dance_floor.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg"></center>'
 			'You approach her from behind. "Hi, Katja!" you shout, so she can hear you.'
 			'She turns around and when she sees it is you, '+iif(npc_sex['A14'] > 0 and func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['sex_clossedness'] < 2, 'gives you a quick kiss', 'she gets a huge smile on her face')+'. "You''re here, too? We''re going to have so much fun! Let''s dance!"'
 			act 'Dance with Katja': gt 'katja_nightclub', 'dance'
@@ -139,21 +142,21 @@ if $ARGS[0] = 'dance_approach':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 			'You approach her and try to move yourself so that she can see you. But when she finally notices you, she just turns around and continues dancing like she doesn''t know who you are.'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_talking_on_dance_floor.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg"></center>'
 			'You approach her from behind. "Hi, Katja!" you shout, so she can hear you.'
 			'She turns around and when she sees it is you, she shouts back, "Hi, <<$pcs_nickname>>! You decided to come clubbing tonight as well? It''s a great place to let loose. Why don''t we dance?"'
 			act 'Dance with Katja': gt 'katja_nightclub', 'dance'	
 		end
 	else
 		if katjaQW['QWstage'] > 0 or npc_rel['A14'] > 70:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_talking_on_dance_floor.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg"></center>'
 			'You approach her and tap her on the shoulder. She turns around, and seeing you, she '+iif(npc_sex['A14'] > 0 and func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['sex_clossedness'] < 2, 'gives you a quick kiss before', 'gets a huge smile on her face')+' shouting, "Great! You''re back. Let''s dance!"'
 			act 'Dance with Katja': gt 'katja_nightclub', 'dance'
 		elseif npc_rel['A14'] < 20:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 			'You approach her and try to move yourself so that she can see you. But when she finally notices you, she just turns around and continues dancing like she doesn''t know who you are.'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_talking_on_dance_floor.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg"></center>'
 			'You approach her and when she sees you coming, she shouts, "Hi, <<$pcs_nickname>>! So you''re back. Let''s dance!"'
 			act 'Dance with katja': gt 'katja_nightclub', 'dance'	
 		end
@@ -169,32 +172,32 @@ if $ARGS[0] = 'bar_approach':
 		katjaQW['disco_met'] = totminut
 		gs 'npc_relationship', 'modify', 'A14', 'like'
 		if katjaQW['QWstage'] > 0 or npc_rel['A14'] > 70:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_bar1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_bar1.jpg"></center>'
 			'You approach the bar where she is getting a drink handed to her by the bartender. "Hi, Katja!" you say loudly, so she can hear you.'
 			'She turns to you with a huge smile. "It''s great to see you here! We''re going to have so much fun! Get a drink and join me, <<$pcs_nickname>>!"'
 			act 'Order a drink': gt 'katja_nightclub', 'drink'
 		elseif npc_rel['A14'] < 20:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_bar1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_bar1.jpg"></center>'
 			'You approach the bar where she is getting a drink handed to her by the bartender, and sit close to her.'
 			'When she notices you, she just acts like she doesn''t know you and strikes up a conversation with another person at the bar, clearly signaling that she doesn''t want to talk to you.'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_bar1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_bar1.jpg"></center>'
 			'You approach the bar where she is getting a drink handed to her by the bartender. "Hi, Katja!" you say loudly, so she can hear you.'
 			'She turns to you and shouts back, "Hi, <<$pcs_nickname>>! You decided to come clubbing tonight as well? It''s a great place to let loose. Have a drink with me!"'
 			act 'Order a drink': gt 'katja_nightclub', 'drink'
 		end
 	else
 		if katjaQW['QWstage'] > 0 or npc_rel['A14'] > 70:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_bar1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_bar1.jpg"></center>'
 			'You approach the bar where she is getting a drink handed to her by the bartender. "Hi, Katja!" you say loudly, so she can hear you.'
 			'She turns to you with a huge smile. "You needed a drink too, <<$pcs_nickname>>? Great minds think alike."'
 			act 'Order a drink': gt 'katja_nightclub', 'drink'
 		elseif npc_rel['A14'] < 20:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_bar1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_bar1.jpg"></center>'
 			'You approach the bar where she is getting a drink handed to her by the bartender, and sit close to her.'
 			'When she notices you, she just acts like she doesn''t know you and strikes up a conversation with another person at the bar, clearly signaling that she doesn''t want to talk to you.'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_bar1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_bar1.jpg"></center>'
 			'You approach the bar where she is getting a drink handed to her by the bartender. "Hi, Katja!" you say loudly, so she can hear you.'
 			'She turns to you. "Hi, <<$pcs_nickname>>! You thirsty, too? Have a drink with me."'
 			act 'Order a drink': gt 'katja_nightclub', 'drink'
@@ -207,7 +210,7 @@ if $ARGS[0] = 'dance_guy_approach':
 	menu_off = 1
 	minut += 5
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dancing_katja_guy<<rand(1,2)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing_katja_guy<<rand(1,2)>>.jpg"></center>'
 	if npc_rel['A14'] <= 20:
 		if katjaQW['disco_arrival'] + 600 > totminut and katjaQW['disco_met'] + 600 > totminut: katjaQW['disco_met'] = totminut & gs 'npc_relationship', 'modify', 'A14', 'like'
 		'As you approach her, she notices you and demonstrably drags the guy she is dancing with away from you. She clearly doesn''t want anything to do with you.'
@@ -288,7 +291,7 @@ if $ARGS[0] = 'dance':
 		gs 'sweat', 'add', 3
 		fat -= 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dancing_wild.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing_wild.jpg"></center>'
 		'A very popular beat comes on, and the crowd goes wild. The dance floor becomes a mass of people moving fast to the rhythm. Dance skill does not matter at the moment, just enthusiasm and stamina.'
 		if katjaQW['drinks'] > 6:
 			iif(alko > 6, 'You and Katja are', 'Katja is')+' having some issues with not bumping into other dancers, not that they seem to be paying any notion to it.'
@@ -296,7 +299,7 @@ if $ARGS[0] = 'dance':
 	elseif temp_rand = 2:
 		gt 'katja_nightclub', 'dance_guy1'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dancing1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing1.jpg"></center>'
 		if katjaQW['drinks'] < 4:
 			'You and Katja are dancing and having fun. She is a pretty good dancer, '+iif(pcs_danc < 50, 'and you are having a little trouble matching her moves.', 'but your moves are clearly better than hers.')
 		elseif katjaQW['drinks'] < 8:
@@ -446,7 +449,7 @@ if $ARGS[0] = 'bar_arrive':
 	if (hour < 6 or hour > 22) and rand(1,4) = 0 and katjaQW['lone_bartender'] < daystart -1: gt 'katja_nightclub', 'lone_bartender'
 	katjaQW['disco_loc'] = 2
 	katjaQW['drinks'] += rand(1,2)
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_bar1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_bar1.jpg"></center>'
 	'You make your way to the bar, which is quite crowded. Katja quickly orders a drink, while you think about what to order.'
 	if pcs_health > 20:
 		act 'Order a drink': gt 'katja_nightclub', 'drink'
@@ -474,7 +477,7 @@ if $ARGS[0] = 'bar_after_drink':
 	temp_rand = rand(1,20)
 	katjaQW['horny'] += 5
 	if temp_rand = 1  and (katjaQW['QWstage'] >= 3 or katjaQW['drinks'] > 3) and katjaQW['sex_clossedness'] < 2:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_kiss_cheek.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_kiss_cheek.jpg"></center>'
 		katjaQW['horny'] += 5
 		iif(katjaQW['disco_drink_bought'] = 1, 'You and Katja are', 'Katja is')+' drinking '+iif(katjaQW['disco_drink_bought'] = 1, 'your', 'her')+' drink, but then suddenly, Katja decides to kiss you on the cheek.'
 		if func('katja_procedural', 'willing_to_be_naughty') < 65 and katjaQW['drinks'] < 8:
@@ -489,11 +492,11 @@ if $ARGS[0] = 'bar_after_drink':
 		katjaQW['disco_drink_bought'] = 0
 		gs 'katja_nightclub', 'bar_end'
 	elseif temp_rand = 2:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dringking_man_approach.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dringking_man_approach.jpg"></center>'
 		'As '+iif(katjaQW['disco_drink_bought'] = 1, 'you and Katja are', 'Katja is')+' drinking '+iif(katjaQW['disco_drink_bought'] = 1, 'your', 'her')+' drink, a well-dressed man comes up to you. "Hello, ladies! Mind if I join you?"'
 		katjaQW['disco_drink_bought'] = 0
 		act 'Let him join':
-			if (katjaQW['QWstage'] < 3 and katjaQW['liberated'] = 0) or (katjaQW['boy_block'] = 1 and katjaQW['sex_clossedness'] <2) or func('katja_procedural', 'willing_to_be_naughty')+katjQW['horny'] < rand (50,100):
+			if (katjaQW['QWstage'] < 3 and katjaQW['liberated'] = 0) or (katjaQW['boy_block'] = 1 and katjaQW['sex_clossedness'] <2) or func('katja_procedural', 'willing_to_be_naughty')+katjaQW['horny'] < rand (50,100):
 				cla
 				if katjaQW['dom'] > rand(0,30):
 					'You start to tell him that he can join you, but Katja says no.'
@@ -512,7 +515,7 @@ if $ARGS[0] = 'bar_after_drink':
 					act 'Just finish your drinks in peace':
 						*clr & cla
 						katjaQW['dom'] += rand(1,2)
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_bar1.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_bar1.jpg"></center>'
 						gs 'katja_nightclub', 'bar_end'
 					end
 				else
@@ -530,7 +533,7 @@ if $ARGS[0] = 'bar_after_drink':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A14', 'dislike'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dringking_man_approach.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dringking_man_approach.jpg"></center>'
 						'You ignore Katja and he joins you. You spend the time chatting with while Katja says nothing.'
 						if rand(5,8) < hotcat:
 							'He then thanks you for a nice time, but says he has to run and leaves you and Katja alone at the bar.'
@@ -582,7 +585,7 @@ if $ARGS[0] = 'bar_after_drink':
 			else
 				*clr & cla
 				katjaQW['horny'] += max(0,rand(katjaQW['slut']-50,100)/50)
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dringking_man_approach.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dringking_man_approach.jpg"></center>'
 				'You tell him he is welcome to join, and Katja nods in agreement. You spend the time chatting with him while your glasses empty.'
 				if rand(5,8) < hotcat:
 					'He then thanks you for a nice time, but says he has to run, and leaves you and Katja alone at the bar.'
@@ -712,7 +715,7 @@ if $ARGS[0] = 'bar_after_drink':
 		act 'Tell him no':
 			if katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] < 2 and katjaQW['horny'] > rand(40,60) and func('katja_procedural', 'willing_to_be_naughty') > rand(80,80):
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_drinnking_bar.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_drinnking_bar.jpg"></center>'
 				'"We would love to have you join us for a drink," Katja says before you have time to say anything.' 
 				act 'Tell Katja that you don''t want him to join':
 					cla
@@ -726,7 +729,7 @@ if $ARGS[0] = 'bar_after_drink':
 					katjaQW['dom'] += rand(1,2)
 					*clr & cla
 					katjaQW['horny'] += max(0,rand(katjaQW['slut']-50,100)/50)
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dringking_man_approach.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dringking_man_approach.jpg"></center>'
 					'You tell him he''s welcome to join, and Katja nods in agreement. You spend the time chatting with him while your glasses empty.'
 					if rand(5,8) < hotcat:
 						'He then thanks you for a nice time, but says he has to run and leaves you and Katja alone at the bar.'
@@ -843,14 +846,14 @@ if $ARGS[0] = 'bar_after_drink':
 				end
 			else
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_drinnking_bar.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_drinnking_bar.jpg"></center>'
 				'You say a polite ''no'', and he accepts and leaves you in peace.'
 				'"Thanks," Katja says. "I didn''t want to talk to some random guy right now."' 
 				gs 'katja_nightclub', 'bar_end'
 			end
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_drinnking_bar.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_drinnking_bar.jpg"></center>'
 		'You spend some time hanging at the bar talking, while '+iif(katjaQW['disco_drink_bought'] = 1, 'you and Katja', 'Katja')+' enjoy'+iif(katjaQW['disco_drink_bought'] = 1, ' your', 's her')+' drink.'
 		gs 'katja_nightclub', 'bar_end'
 	end
@@ -932,7 +935,7 @@ if $ARGS[0] = 'bar_end':
 end
 
 if $ARGS[0] = 'dance_guy1':
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dancing2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing1.jpg"></center>'
 	'A guy approaches you and Katja and it''s clear that he wants to join you two dancing. He''s rather good looking and wearing nice clothes.'
 	act 'Let him join you': gt 'katja_nightclub', 'dance_guy2'
 	act 'Don''t let him join':
@@ -950,7 +953,7 @@ if $ARGS[0] = 'dance_guy2':
 		gs 'exp_gain', 'danc', 1
 		frost = 0
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dancing_extra_guy1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing_extra_guy1.jpg"></center>'
 		'You dance through several songs, and while he is a '+iif(rand(0,1) = 0, 'good', 'terrible')+' dancer, he never tries to get too close to either of you nor Katja. In fact, whenever you try to get closer to him, he always distances himself.'
 		'After some time, he thanks you for the dance and excuses himself.'
 		'"Well, seems he wasn''t that into us," Katja says with a smile.'
@@ -969,7 +972,7 @@ if $ARGS[0] = 'dance_guy3':
 	frost = 0
 	gs 'arousal', 'foreplay', rand(-5,0) 
 	katjaQW['horny'] += rand(0,10)
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_dancing_extra_guy1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing_extra_guy1.jpg"></center>'
 	'You dance through several songs, and he is clearly into you and and Katja. He dances quite close to you and, from time to time, his hand moves from your back to your ass.'
 	if hotcat < rand(0,12):
 		gs 'arousal', 'end'
@@ -1097,7 +1100,7 @@ if $ARGS[0] = 'dance_guy3':
 				end
 			else
 				'After some time, he tells you that his place isn''t far from here and suggests that you continue the party at his place, making it very clear that he''s expecting his bedroom to be the main location of the party.'
-				if katjaQW['QWstage'] <= 5 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] < rand (50,100):
+				if katjaQW['QWstage'] <= 5 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] < rand (50,100):
 					'"No. We prefer to stay here and dance," Katja replies quickly in a firm voice, which clearly surprises the guy.'
 					if katjaQW['QWstage'] >= 5 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] = 0:
 						act 'Try to convince Katja to go with him':
@@ -1164,7 +1167,7 @@ if $ARGS[0] = 'dance_guy3':
 						gs 'katja_nightclub', 'dance_end'
 					end
 				else
-					if (func('katja_procedural', 'willing_to_be_naughty') >= 100 and katjaQW['horny'] >= 100 and katajQW['dom'] >= 0) or (katjaQW['dom'] >= 25 and func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] >= 150):
+					if (func('katja_procedural', 'willing_to_be_naughty') >= 100 and katjaQW['horny'] >= 100 and katjaQW['dom'] >= 0) or (katjaQW['dom'] >= 25 and func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] >= 150):
 						'"That sounds like a good idea. I''m sure that you have lots of ways to entertain us," Katja says in a seductive voice, before you even have time to reply.'
 						act 'Go home with him':
 							cla
@@ -1279,14 +1282,14 @@ if $ARGS[0] = 'private_room1':
 	katjaQW['drinks'] += rand(1,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy<<rand(1,2)>>.jpg"></center>'
-	'The room has couches and a table, and as you sit down, he tells you that he has already ordered drinks for you. He then introduces himself as <<$boyname>> and asks for your names.'
+	'The room has couches and a table, and as you sit down, he tells you that he has already ordered drinks for you. He then introduces himself as <<$npc_nickname[$npclastgenerated]>> and asks for your names.'
 	'The cocktails arrives before you and Katja finish your introduction, and you start sipping your drinks while you continue to talk.'
 	if rand(0,3) = 0:
 		if katjaQW['coke_stage'] = -1:
-			'After a few minutes, <<$boyname>> says, "Why don''t we try some other good stuff?" He pulls out a small bag with white powder inside.'
+			'After a few minutes, <<$npc_nickname[$npclastgenerated]>> says, "Why don''t we try some other good stuff?" He pulls out a small bag with white powder inside.'
 			'"That''s it. I''m out of here," Katja says and gets up and leaves abruptly.'
-			'<<$boyname>> looks confused. "What was that about?" he asks.'
-			'"My friend has had an addiction problem. She''s over it now, but tries to avoid drugs because of that," you explain. "I''m very sorry, but I need to check up on my friend," you say and leave <<$boyname>>.'
+			'<<$npc_nickname[$npclastgenerated]>> looks confused. "What was that about?" he asks.'
+			'"My friend has had an addiction problem. She''s over it now, but tries to avoid drugs because of that," you explain. "I''m very sorry, but I need to check up on my friend," you say and leave <<$npc_nickname[$npclastgenerated]>>.'
 			act 'Find Katja':
 				*clr & cla	
 				minut += 10
@@ -1302,8 +1305,8 @@ if $ARGS[0] = 'private_room1':
 			act 'Enjoy your drinks':
 				*clr & cla
 				minut += 5
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_guy_coke.jpg"></center>'
-				'After a few minutes, <<$boyname>> says, "Why don''t we try some other good stuff?" He pulls out a small bag with white powder inside.'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_guy_coke.jpg"></center>'
+				'After a few minutes, <<$npc_nickname[$npclastgenerated]>> says, "Why don''t we try some other good stuff?" He pulls out a small bag with white powder inside.'
 				if katjaQW['coke_stage'] = 0:
 					'Katja looks confused at first, she''s not really sure what it is. But as he pours some of the powder on the table and makes several lines, she seems to realize what''s going on and starts to look surprised and then skeptical.'
 					'"I''ll go first, if you ladies don''t mind," he says. And as he sniffs the first line, Katja look starts to change to curious. After he finishes, he looks around. "Who''s next?" he asks and he holds out the tube he used to sniff the cocaine.' 
@@ -1329,7 +1332,7 @@ if $ARGS[0] = 'private_room1':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/drugs/cocaine.jpg"></center>'
 						'You take the tube and snort the first line and then the second, while Katja looks at you with wide open eyes.'
-						'After a short moment, it hits you and you feel the full effect of the drug. <<$boyname>> takes the tube from you and tries to hand it to Katja, but she doesn''t take it. "I don''t do drugs. I''ve never done it before."'
+						'After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube from you and tries to hand it to Katja, but she doesn''t take it. "I don''t do drugs. I''ve never done it before."'
 						if func('katja_procedural', 'willing_to_be_naughty') < 85:
 							gs 'willpower', 'drugs', 'force', 'hard'
 						else
@@ -1349,7 +1352,7 @@ if $ARGS[0] = 'private_room1':
 								'"I''m still not sure. Why should I do it?" she asks.'
 								'"Because it feels great. You can''t say it''s not for you until you actually know how it feels," you say.'
 								*nl
-								'"OK," Katja finally relents. With a shaking hand, she takes the tube. She then places it at her nostril and slowly bends down so the other end is at the line of cocaine that <<$boyname>> prepared for her.'
+								'"OK," Katja finally relents. With a shaking hand, she takes the tube. She then places it at her nostril and slowly bends down so the other end is at the line of cocaine that <<$npc_nickname[$npclastgenerated]>> prepared for her.'
 								'She slowly starts sniffing it but jerks her head back when the powder start to itch in her nose. "Do it, faster. All at once!" you tell her, and she gets down again, still shaking and gets ready.'
 								'This times she snorts it all in on go, and raises her head from the table. It''s clear that the powder itches her nostrils and she looks like she is about to sneeze. "Don''t sneeze! Keep it in!" you tell her, and Katja moves her hand to her nose to prevent it from coming out.'
 								*nl
@@ -1364,7 +1367,7 @@ if $ARGS[0] = 'private_room1':
 						act 'Don''t push Katja':
 							cla
 							minut += 2
-							'"It''s fine if you don''t want to, Katja," you say. She seems relieved. <<$boyname>> doesn''t say anything and just cleans up the drugs.'
+							'"It''s fine if you don''t want to, Katja," you say. She seems relieved. <<$npc_nickname[$npclastgenerated]>> doesn''t say anything and just cleans up the drugs.'
 							act 'Continue talking': gt 'katja_nightclub', 'private_room2', 2
 						end
 					end
@@ -1395,7 +1398,7 @@ if $ARGS[0] = 'private_room1':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/drugs/cocaine.jpg"></center>'
 						'"I''ll take some, but I think my friend will not partake," you say as you take the tube while Katja nods her head. You put one end of the tube to your nose and the other to the first of the lines he has prepared for you.' 
-						'You snort the first line and then the second while Katja looks at you with wide open eyes. After a short moment, it hits you and you feel the full effect of the drug. <<$boyname>> takes the tube and cleans up the drugs.'
+						'You snort the first line and then the second while Katja looks at you with wide open eyes. After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube and cleans up the drugs.'
 						act 'Continue talking': gt 'katja_nightclub', 'private_room2', 2				
 					end
 					if katjaQW['coke_stage'] = 2:
@@ -1419,14 +1422,14 @@ if $ARGS[0] = 'private_room1':
 							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
-							'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$boyname>>.'
+							'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 							'She still looks skeptical. "I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea," she replies.'
 							'"You liked it last time! it will be fine this time, too," you continue.'
 							'"I''m not sure. '+iif(katjaQW['coke_stage'] = 2, 'I don''t want it to become a habit', 'I think the last time was enough for me')+'" she says.' 
 							'"Don''t be such a bore. You know you will love it," you say.'
 							'Katja finally relents. "OK. Let''s do it, together," she says.'
 							*nl
-							'<<$boyname>> has already produced another tube and hands it to Katja, who takes it with unsteady hands. You both lover your heads to the table.'
+							'<<$npc_nickname[$npclastgenerated]>> has already produced another tube and hands it to Katja, who takes it with unsteady hands. You both lover your heads to the table.'
 							'Then at the same time, you sniff your lines. Katja '+iif(katjaQW['coke_stage'] = 2, 'has gotten used to it and it doesn''t itch her nostrils anymore.', 'is still getting itching nostrils and has to concentrate on not sneezing.')
 							*nl
 							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. Then she starts giggling, which turns into a laugh that lasts for some time.'
@@ -1468,7 +1471,7 @@ if $ARGS[0] = 'private_room1':
 									iif(katjaQW['coke_stage'] = 3, 'Katja looks at you. "Do you think I take too much?"', 'Katja scowls at you. "Are you implying I can''t control myself?"')
 									'"I''m just saying that maybe we should relax a little. Right now is not the time for this," you say.'
 									'Katja thinks about it for a moment. '+iif(katjaQW['coke_stage'] = 3, '"OK. Not tonight," she says.', '"Fine," she says, clearly not happy about it.')
-									'"Well, more for me then," <<$boyname>> says and does a few more lines before packing away the drugs.'
+									'"Well, more for me then," <<$npc_nickname[$npclastgenerated]>> says and does a few more lines before packing away the drugs.'
 									act 'Continue talking': gt 'katja_nightclub', 'private_room2', 1							
 								end
 							else
@@ -1480,7 +1483,7 @@ if $ARGS[0] = 'private_room1':
 								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
 								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
-								'You watch as Katja takes the tube, puts one end at her nose and bows down to the start of the line that <<$boyname>> has prepared for her.'
+								'You watch as Katja takes the tube, puts one end at her nose and bows down to the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
 								'She then sniffs the line with no problem and just sits up waiting for the the drugs to hit her.' 
 								*nl
 								'After a moment, it does and Katja just sits there with wide open eyes. She starts giggling which turns into a laugh that lasts for some time.'
@@ -1499,8 +1502,8 @@ if $ARGS[0] = 'private_room1':
 						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'										
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
-						'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$boyname>>.'
-						'She agrees and <<$boyname>> hands her another tube and Katja takes it happily.'
+						'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
+						'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube and Katja takes it happily.'
 						'You put your tubes to your nostrils and lover your heads to the table and sniff your line. Katja does it with great enthusiasm.' 
 						*nl
 						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling which turns into a laugh that lasts for some time.'
@@ -1554,7 +1557,7 @@ if $ARGS[0] = 'private_room1':
 										'"You aren''t my mom!" Katja says.'
 										'"No, I''m not, and I''m sure she would be harsher with you than I am," you answer.'
 										'Katja is silently thinking about it for a moment. "Fine. You get it your way, this time," she says, clearly not happy about it.'
-										'"Well, more for me then," <<$boyname>> says and does a few more lines before packing away the drugs. Katja looks longingly at the drugs while he is doing so.'
+										'"Well, more for me then," <<$npc_nickname[$npclastgenerated]>> says and does a few more lines before packing away the drugs. Katja looks longingly at the drugs while he is doing so.'
 										act 'Continue talking': gt 'katja_nightclub', 'private_room2', 1							
 									end
 								else
@@ -1567,7 +1570,7 @@ if $ARGS[0] = 'private_room1':
 								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
 								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
-								'You watch as Katja takes the tube, puts one end at her nose and bows down so the other end is at the start of the line that <<$boyname>> has prepared for her.'
+								'You watch as Katja takes the tube, puts one end at her nose and bows down so the other end is at the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
 								'She then sniffs the line like a pro and sits up, waiting for the the drugs to hit her.' 
 								*nl
 								'After a moment, it does and Katja sits there with wide open eyes. She starts giggling which turns into a laugh that lasts for some time.'
@@ -1587,7 +1590,7 @@ if $ARGS[0] = 'private_room1':
 						gs 'stat'										
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 						'"Okay, Katja. Let''s do it together," you say.'
-						'"Yes. That''s the spirit," she replies as she has already taken the tube from <<$boyname>>. He quickly produces another one and hands it to you.'
+						'"Yes. That''s the spirit," she replies as she has already taken the tube from <<$npc_nickname[$npclastgenerated]>>. He quickly produces another one and hands it to you.'
 						'You both put your tubes to you nostrils and lover your heads to the table and sniff your lines. Katja does it like it''s something she does all the time.' 
 						*nl
 						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling which turns into a laugh that lasts for some time.'
@@ -1606,15 +1609,15 @@ if $ARGS[0] = 'private_room2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy<<rand(1,2)>>.jpg"></center>'
 	if hotcat + ARGS[1] < rand(6,14):
 		gs 'stat'
-		'You sit and talk for a while, and after your drinks are finished, <<$boyname>> says that he''s had a great time but he has to go. He says goodbye and leaves you and Katja siting alone in the booth.'
+		'You sit and talk for a while, and after your drinks are finished, <<$npc_nickname[$npclastgenerated]>> says that he''s had a great time but he has to go. He says goodbye and leaves you and Katja siting alone in the booth.'
 		'You and Katja look at each other, a bit confused.'
 		'Katja then suggests that the two of you should go dancing and you follow her to the dance floor.'
 		act 'Go to the dance floor': gt 'katja_nightclub', 'dance'
 	else
 		gs 'arousal', 'foreplay', 3
 		gs 'stat'
-		'You sit and talk while you sip your drinks. During this time, <<$boyname>>''s hands become more and more daring. At first, they just accidentally touch you or Katja, but as time goes on, they keep lingering on your thighs.'
-		if (katjaQW['QWstage'] <= 6 and katjaQW['liberated'] = 0) or (katjaQW['simultanous_boys'] = 0 and katjaQW['liberated'] = 1) or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] < rand (75,150):
+		'You sit and talk while you sip your drinks. During this time, <<$npc_nickname[$npclastgenerated]>>''s hands become more and more daring. At first, they just accidentally touch you or Katja, but as time goes on, they keep lingering on your thighs.'
+		if (katjaQW['QWstage'] <= 6 and katjaQW['liberated'] = 0) or (katjaQW['simultanous_boys'] = 0 and katjaQW['liberated'] = 1) or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] < rand (75,150):
 			'Katja is having none of it, demonstrably removing his hand from her thigh when it has been the for just a second. He then tries with your thigh to see if he has more luck.'
 			act 'Make it clear that you''re also not interested':
 				cla
@@ -1628,13 +1631,13 @@ if $ARGS[0] = 'private_room2':
 				act 'Follow Katja to the dance floor': gt 'katja_nightclub', 'dance'
 			end
 			if katjaQW['QWstage'] >= 6 and katjaQW['sex_clossedness'] = 0 and katjaQW['boy_block'] = 0:
-				if func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] > 100:
+				if func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 100:
 					gs 'willpower', 'sex', 'force', 'easy'
 				else
 					gs 'willpower', 'sex', 'force'
 				end
 				if will_cost <= pcs_willpwr:
-					act 'Convince Katja to have sex with <<$boyname>> (<<will_cost>> Willpower)':
+					act 'Convince Katja to have sex with <<$npc_nickname[$npclastgenerated]>> (<<will_cost>> Willpower)':
 						cla
 						gs 'willpower', 'pay', 'force'
 						gs 'arousal', 'foreplay_give', 3
@@ -1646,26 +1649,26 @@ if $ARGS[0] = 'private_room2':
 						act 'Have a threesome': gt 'katja_nightclub_sex', 'private_booth_FFM'
 					end
 				else
-					act 'Convince Katja to have sex with <<$boyname>> (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Convince Katja to have sex with <<$npc_nickname[$npclastgenerated]>> (<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 katajQW['faithful'] = 0:
-				act 'Have sex with <<$boyname>> without Katja': 
+			if katjaQW['faithful'] = 0:
+				act 'Have sex with <<$npc_nickname[$npclastgenerated]>> without Katja': 
 					'You accept his touch and place your hand on his thighs, moving it slowly towards his crotch. "Mmm. this is something I''m going to enjoy," you say as you hand reaches his cock.'
-					'"What are you doing, <<pcs_nickname>>?" Katja asks while getting flustered. YOu just ignore her and continue to stroke <<$boyname>>''s now hard cock through his pants.'
+					'"What are you doing, <<$pcs_nickname>>?" Katja asks while getting flustered. YOu just ignore her and continue to stroke <<$npc_nickname[$npclastgenerated]>>''s now hard cock through his pants.'
 					'He takes your groping as approval and starts pawing at your <<$pcs_desc[''breast'']>> breasts. You''re so into it, that you don''t even notice Katja get up and leave.'
-					act 'Have sex with <<$boyname>>': picrand = 38 & $sexloc = 'city_nightclub' & xgt 'sex', 'var'
+					act 'Have sex with <<$npc_nickname[$npclastgenerated]>>': picrand = 38 & $sexloc = 'city_nightclub' & xgt 'sex', 'var'
 				end
 			end
 		else
 			gs 'arousal', 'erotic', -3
 			gs 'stat'
-			'Katja is visibly enjoying his attention and reciprocates by starting to stroke his thigh, moving closer and closer to his crutch. <<$boyname>> seems completely captivated by her and forgets about you. Moving his hand from your thigh to Katja''s breasts.'
-			'"You gotta feel this, <<pcs_nickname>>," Katja says as she starts stroking his cock through his pants. "It''s '+iif(dick > 17, 'very big', 'nice')+' and hard. I think we will have a good time with it," she says in her most seductive voice.'
+			'Katja is visibly enjoying his attention and reciprocates by starting to stroke his thigh, moving closer and closer to his crutch. <<$npc_nickname[$npclastgenerated]>> seems completely captivated by her and forgets about you. Moving his hand from your thigh to Katja''s breasts.'
+			'"You gotta feel this, <<$pcs_nickname>>," Katja says as she starts stroking his cock through his pants. "It''s '+iif(dick > 17, 'very big', 'nice')+' and hard. I think we will have a good time with it," she says in her most seductive voice.'
 			act 'Join Katja and have a threesome': gt 'katja_nightclub_sex', 'private_booth_FFM'
-			if func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] > 200:
+			if func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 200:
 				gs 'willpower', 'sex', 'force', 'hard'
-			elseif func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] > 100:
+			elseif func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 100:
 				gs 'willpower', 'sex', 'force'
 			else
 				gs 'willpower', 'sex', 'force', 'easy'
@@ -1683,7 +1686,7 @@ if $ARGS[0] = 'private_room2':
 			else
 				act 'Convince Katja to stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			if katajQW['faithful'] = 0:
+			if katjaQW['faithful'] = 0:
 				act 'Give them some privacy':
 					cla
 					katjaQW['disco_loc'] = 7

locations/Katja_nightclub_sex.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'private_booth_FFM':
 	gs 'arousal', 'foreplay_give', 3, 'group', 'lesbian'
 	KatjaQW['horny'] += rand(10,20)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private1.jpg"></center>'
-	'"Why don''t the two of you get started?" <<$boyname>> says. Katja '+iif(npc_sex['A14'] = 0, ' looks at you with curious', 'eager')+' eyes. You take that as an invitation and get up while Katja follows.'
+	'"Why don''t the two of you get started?" <<$npc_nickname[$npclastgenerated]>> says. Katja '+iif(npc_sex['A14'] = 0, ' looks at you with curious', 'eager')+' eyes. You take that as an invitation and get up while Katja follows.'
 	if katjaQW['QWstage'] >= 3:
 		'Katja quickly goes for a deep kiss and starts to undress you. You follow her lead and start pulling her clothes off.'
 	elseif katjaQW['simultanous_girls'] > 1:
@@ -27,12 +27,12 @@ if $ARGS[0] = 'private_booth_FFM':
 		'You approach a hesitant Katja for a kiss and, while she kisses you back, it''s fairly clumsy - like she has never made out with anyone before. After a short while, you break off and start to remove your clothes while Katja slowly does the same.'
 	end
 	'You are '+iif($pantyworntype = 'none', 'already completely naked', 'only wearing panties')+'  and while Katja is still wearing some of her underwear, her nice, round boobs are on full display.'
-	'So you just go for it and start sucking on her left tit. She starts moaning loudly and <<$boyname>> looks on intently.'
+	'So you just go for it and start sucking on her left tit. She starts moaning loudly and <<$npc_nickname[$npclastgenerated]>> looks on intently.'
 	gs 'stat'
 	act 'Start licking her pussy':
 		*clr & cla	
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private2.jpg"></center>'
-		'You gently lay Katja down and start licking her now very wet pussy. She moans and <<$boyname>> can''t hold back anymore and starts sucking on her luscious breast.'
+		'You gently lay Katja down and start licking her now very wet pussy. She moans and <<$npc_nickname[$npclastgenerated]>> can''t hold back anymore and starts sucking on her luscious breast.'
 		gs 'arousal', 'cuni_give', 3, 'group', 'lesbian'
 		KatjaQW['horny'] += rand(10,20)		
 		gs 'stat'
@@ -54,36 +54,36 @@ if $ARGS[0] = 'private_booth_FFM':
 					katjaQW['first_time_in_nightclub'] = 2
 					gs 'npc_relationship', 'modify', 'A14', 'adore'	
 				end
-				'Your licking is pretty good and soon Katja has a powerful, explosive orgasm. <<$boyname>> watches in amazement.' 
+				'Your licking is pretty good and soon Katja has a powerful, explosive orgasm. <<$npc_nickname[$npclastgenerated]>> watches in amazement.' 
 			else
-				'While you lick each other, <<$boyname>> looks on, getting more and more aroused.'
+				'While you lick each other, <<$npc_nickname[$npclastgenerated]>> looks on, getting more and more aroused.'
 			end
 			gs 'arousal', 'cuni_give', 3, 'group', 'lesbian'
 			gs 'arousal', 'cuni', -3, 'group', 'lesbian'
 			gs 'stat'
-			act 'Suck <<$boyname>>''s cock':
+			act 'Suck <<$npc_nickname[$npclastgenerated]>>''s cock':
 				*clr & cla	
 				KatjaQW['horny'] += rand(5,10)
 				if npc_throat['A14'] < dick: npc_throat['A14'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private4.jpg"></center>'
-				'"Why don''t you join us, <<$boyname>>?" you ask. He quickly gets up and you help him undress, revealing his <<dick>> cm <<$dick_girth>> cock.'
-				'"Let''s give this nice cock a good licking, Katja," you say. The two of you get on your knees and share <<$boyname>>''s dick.' 
+				'"Why don''t you join us, <<$npc_nickname[$npclastgenerated]>>?" you ask. He quickly gets up and you help him undress, revealing his <<dick>> cm <<$dick_girth>> cock.'
+				'"Let''s give this nice cock a good licking, Katja," you say. The two of you get on your knees and share <<$npc_nickname[$npclastgenerated]>>''s dick.' 
 				gs 'arousal', 'bj', 3, 'group'
 				gs 'stat'
 				act 'Get to fucking':
 					*clr & cla	
 					KatjaQW['horny'] += rand(5,10)
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private5.jpg"></center>'
-					'"I think my cock deserves some pussy now," <<$boyname>> says after you''ve sucked his cock for a few minutes.'
+					'"I think my cock deserves some pussy now," <<$npc_nickname[$npclastgenerated]>> says after you''ve sucked his cock for a few minutes.'
 					'You lie down on the table, and he gets right to jamming his very hard cock into your pussy and starts thrusting.'
-					'Katja looks on for a moment, then she moves her mouth to your pussy and starts to lick your clit while <<$boyname>>''s cock goes in and out of your slit.' 
+					'Katja looks on for a moment, then she moves her mouth to your pussy and starts to lick your clit while <<$npc_nickname[$npclastgenerated]>>''s cock goes in and out of your slit.' 
 					gs 'arousal', 'vaginal', 3, 'group'
 					gs 'arousal', 'cuni', -2, 'group', 'lesbian'
 					gs 'stat'
 					act 'Katja''s turn':
 						*clr & cla	
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private6.jpg"></center>'
-						'"Now, it''s time to try the redhead''s pussy," <<$boyname>> says as he pulls out of your pussy. He grabs Katja and pushes her down on her back on the couch before pulling her ass up on the arm.'
+						'"Now, it''s time to try the redhead''s pussy," <<$npc_nickname[$npclastgenerated]>> says as he pulls out of your pussy. He grabs Katja and pushes her down on her back on the couch before pulling her ass up on the arm.'
 						if npc_vag['A14'] < dick:
 							katjaQW['horny'] -= rand(10,20)
 							'He jams his dick into her pussy, and Katja gives out a surprised shriek, clearly not used to cocks this size. He ignores that and continues to pound her.'
@@ -92,11 +92,11 @@ if $ARGS[0] = 'private_booth_FFM':
 							'He jams his dick into her pussy, which goes in smoothly while Katja lets out a huge moan. He then starts to pound her.'
 						end
 						'You get on the couch and lower your ass to Katja''s face, and she '+iif(katjaQW['simultanous_girls'] >= 1, 'eagerly', 'clumsily')+' begins to lick your pussy.'
-						'<<$boyname>> then grabs your head and starts to make out with you while he fucks Katja, who is still licking your pussy.'
+						'<<$npc_nickname[$npclastgenerated]>> then grabs your head and starts to make out with you while he fucks Katja, who is still licking your pussy.'
 						gs 'arousal', 'kiss', -2, 'group'
 						gs 'arousal', 'cuni', 3, 'group', 'lesbian'
 						gs 'stat'
-						act 'Get on top of <<$boyname>>':
+						act 'Get on top of <<$npc_nickname[$npclastgenerated]>>':
 							*clr & cla	
 							KatjaQW['horny'] += rand(5,15)						
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private7.jpg"></center>'
@@ -119,8 +119,8 @@ if $ARGS[0] = 'private_booth_FFM':
 									*clr & cla	
 									KatjaQW['horny'] += rand(5,15)						
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private9.jpg"></center>'
-									'"Get up on all fours and show me those booties," <<$boyname>> says as he stands up.'
-									'Following his commands, you crawl up on the couch and stick out your butts. <<$boyname>> starts playing with both of your pussies.'
+									'"Get up on all fours and show me those booties," <<$npc_nickname[$npclastgenerated]>> says as he stands up.'
+									'Following his commands, you crawl up on the couch and stick out your butts. <<$npc_nickname[$npclastgenerated]>> starts playing with both of your pussies.'
 									'He then gets up and shoves his cock into Katja, fucking her again. Katja '+iif(npc_vag['A14'] < dick, 'seems to be feeling a mix of pain and pleasure.', 'is moaning very loudly.')
 									gs 'arousal', 'cuni', 3, 'group'
 									gs 'stat'
@@ -128,7 +128,7 @@ if $ARGS[0] = 'private_booth_FFM':
 										*clr & cla	
 										KatjaQW['horny'] += rand(0,10)						
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private10.jpg"></center>'
-										'<<$boyname>> then switches from Katja to you and stuffs his <<$dick_girth>> cock into your '+iif(pcs_vag < dick, 'tight ','')+'pussy.'
+										'<<$npc_nickname[$npclastgenerated]>> then switches from Katja to you and stuffs his <<$dick_girth>> cock into your '+iif(pcs_vag < dick, 'tight ','')+'pussy.'
 										'He starts to pound you and Katja gets up close to see how his dick glides in and out of your pussy.' 
 										gs 'arousal', 'vaginal', 3, 'group'
 										gs 'stat'
@@ -136,7 +136,7 @@ if $ARGS[0] = 'private_booth_FFM':
 											*clr & cla	
 											KatjaQW['horny'] += rand(10,20)						
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private11.jpg"></center>'
-											'Katja seems very eager to get some more cock, so much that she crawls up on your back to present her ass to <<$boyname>>. He promptly removes his cock from your pussy and shoves it back in hers.'
+											'Katja seems very eager to get some more cock, so much that she crawls up on your back to present her ass to <<$npc_nickname[$npclastgenerated]>>. He promptly removes his cock from your pussy and shoves it back in hers.'
 											if KatjaQW['horny'] >= 100:
 												KatjaQW['horny'] = 0
 												'He starts fucking her as hard as he can but Katja dares him to fuck her harder. Soon, she is howling when she has a huge orgasm on your back.'
@@ -149,7 +149,7 @@ if $ARGS[0] = 'private_booth_FFM':
 												*clr & cla	
 												KatjaQW['horny'] += rand(0,10)						
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private12.jpg"></center>'
-												'<<$boyname>> pulls out of Katja and shouts "You! On your back. I''m going to fuck you one more time before I come."'
+												'<<$npc_nickname[$npclastgenerated]>> pulls out of Katja and shouts "You! On your back. I''m going to fuck you one more time before I come."'
 												'You do as he says and lie down on the table. He quickly starts to fuck you, while Katja licks your breast. He''s very close to cumming.'
 												gs 'arousal', 'vaginal', 3, 'group'
 												gs 'arousal', 'foreplay', -3, 'group', 'lesbian'
@@ -157,11 +157,11 @@ if $ARGS[0] = 'private_booth_FFM':
 												act 'He''s cumming':
 													*clr & cla	
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private13.jpg"></center>'
-													'<<$boyname>> suddenly pulls out and cums all over your butts while Katja and you are flicking your tongues together.'
+													'<<$npc_nickname[$npclastgenerated]>> suddenly pulls out and cums all over your butts while Katja and you are flicking your tongues together.'
 													'"That was great" he says and slumps back into the couch. "What a wonderful fuck. You ladies are fantastic," he continuous,'
 													iif(KatjaQW['horny'] <= 10, '"Yes, it was very fun. We had a great time,"', '"Sure, it was fun!"')+' Katja says '+iif(KatjaQW['horny'] <= 10, 'sounding very satisfied.', 'not sounding completely honest.')
-													'She finds some napkins in her purse and hands them to you to clean off the cum. You then get dressed while <<$boyname>> keeps sitting on the couch.'
-													'"I feel energized," Katja says. "Let''s go dance. Bye, <<$boyname>>!" she continues, and she practically drags you to the dance floor.'
+													'She finds some napkins in her purse and hands them to you to clean off the cum. You then get dressed while <<$npc_nickname[$npclastgenerated]>> keeps sitting on the couch.'
+													'"I feel energized," Katja says. "Let''s go dance. Bye, <<$npc_nickname[$npclastgenerated]>>!" she continues, and she practically drags you to the dance floor.'
 													gs 'arousal', 'kiss', 3, 'lesbian'
 													gs 'arousal', 'end'
 													gs 'cum_call', 'stomach', $boy, 1

locations/anushapt_city.qsrc

@@ -249,7 +249,7 @@ if $ARGS[0] = 'home':
 	!elseif (week = 6 and hour >= 16 and hour < 20) or (week = 6 and hour >= 8 and hour < 20):
 	elseif $AnushkaLocCity = 'home' and $ValentinLocCity = 'home':
 		*clr & cla
-		minute += 1
+		minut += 1
 		!locat['A144'] = 2
 		aptdoor = rand(1,2)
 		'You stand outside the door as you knock, waiting to see who answers it.'

locations/city_center.qsrc

@@ -155,7 +155,7 @@ end
 if week >= 4 and (hour >= 18 or hour <= 3):
 	$desc_txt3 = '<a href="exec:gt ''city_nightclub'', ''start''">the nightclub</a>'
 else
-	$desc_txt3 = '<a href="exec:msg ''The nightclub is closed and will open from Friday to Sunday at 18:00''">The nightclub</a>'
+	$desc_txt3 = '<a href="exec:msg ''The nightclub is closed and will open from Thursday to Sunday at 18:00''">The nightclub</a>'
 end
 'The only place open here at night is <<$desc_txt3>>.'
 *nl

locations/city_nightclub.qsrc

@@ -192,6 +192,8 @@ if $ARGS[0] = 'dance':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club9.jpg"></center>'
 	'The club is filled to the brim with people, most of whom are on the dance floor having a great time.'
 
+	gs 'katja_nightclub', 'activity', 'dance_floor'
+
 	act 'Leave the dance floor':gt 'city_nightclub', 'inside'
 
 	if hour <= 3 or hour >= 18:
@@ -472,6 +474,8 @@ if $ARGS[0] = 'bar':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club10.jpg"></center>'
 	'You have to squeeze yourself through the crowd to get to the bar. On your way, random guys try to lay their hands on you, try to convince you to dance or drink with them. Some even try to grope your tits or ass and some play the white knight and try to get your attention by protecting you.'
 
+	gs 'katja_nightclub', 'activity', 'bar'
+
 	if pcs_apprnc > 56:
 		barsexrand = rand(0, 10)
 		if barsexrand = 1: killvar 'barsexrand' & gt 'city_nightclub', 'bar0'

locations/katja_chat.qsrc

@@ -412,8 +412,8 @@ if $ARGS[0] = 'coffee_hole_event':
 	else
 		katjaQW['brunch_bought'] = 0
 		if katjaQW['first_time_in_nightclub'] > 0 and npc_sex['A14'] = 0: gt 'katja_chat', 'nightclub_sex_follow_up'
-		katjQW['coffee_hole_rand'] = rand(0,20)
-		if katjQW['coffee_hole_rand'] = 1 and npc_rel['A16'] > 30 and npc_rel['A240'] > 30:
+		katjaQW['coffee_hole_rand'] = rand(0,20)
+		if katjaQW['coffee_hole_rand'] = 1 and npc_rel['A16'] > 30 and npc_rel['A240'] > 30:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole1.jpg"></center>'
 			'While you are chatting with Katja she suddenly smiles and points to the the door so you turn to have a look. You notice that both Natasha and Natalia are just entering.'
 			'As the pair of you are still focused on the door you see Natalia poke Natashsa in the arm and point towards your table. They both look over and give you a friendly wave.'
@@ -430,7 +430,7 @@ if $ARGS[0] = 'coffee_hole_event':
 			'Natalia looks at Natasha indicating that they should move on. "Come on you, let''s get our coffee and leave these two to it before we end up causing an argument."'
 			'After an exchange of good byes they find their table and order their drinks while you and Katja get back to your conversation.'
 			act 'Continue to drink you coffee': gt 'katja_chat', 'coffee_hole_hangout'
-		elseif katjQW['coffee_hole_rand'] = 2 and university['semester_week'] > 1:
+		elseif katjaQW['coffee_hole_rand'] = 2 and university['semester_week'] > 1:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 			'Katja begins telling you about the last dorm party she attended. "You know that last dorm party was pretty good, until the usual bad boys started to ruin it," she says. "There was this girl, a freshman I think, clearly not used to these parties or drinking as much as the boys do. Quite cute too," she continues. "It seems that the bad crowd targeted her, and started pushing her to drink."'
 			'"I didn''t really pay attention, I was mostly chatting with Vicky and Vanya, but I did notice her being very drunk at some point." She takes a dramatic pause. "BAM! Suddenly a door to one of the room slammed open, and one of the biggest jerks on campus burst out with vomit all over his bare chest."'
@@ -445,7 +445,7 @@ if $ARGS[0] = 'coffee_hole_event':
 				'"I got the girl back to her room, and stayed with her until I was sure she would be okay." Katja finishes her story. "If Vicky had''t been a hero, we would probably have been beat up or worse. Come to think about it, if the girl hadn''t vomited then the guy would''ve probably raped her. Guys are so terrible. I sometimes wish there weren''t any boys, just girls."'
 				act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
 			end
-		elseif katjQW['coffee_hole_rand'] = 3 and npc_rel['A152'] >= 30:
+		elseif katjaQW['coffee_hole_rand'] = 3 and npc_rel['A152'] >= 30:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 			'A guy you don''t recognize at first comes into the Coffee Hole. He''s dressed like a character from a medieval movie, wearing a white shirt and tight leather pants. His hair is long and white, though he clearly isn''t old. Most prominently, he appears to have two long swords sheathed on his back.'
 			'He looks around and when he sees you and Katja, he smiles and walks up to you. You look over at Katja, who doesn''t seem to recognize him either. When he reaches your table, you realize that it is Feofan. He''s grown a fair bit of stubble and dyed his hair.'
@@ -546,7 +546,7 @@ if $ARGS[0] = 'coffee_hole_event':
 					'"The what?" Katja asks, looking no wiser.' 
 					'"The Witcher, the video game series. Help me out, <<$pcs_nickname>>! You know it, don''t you?" he asks.'
 					'"No, I don''t," you answer.'
-					'"I don''t believe it. '+iif(gruptype = 3 or  nerd_game['stage'] > 0, 'You disappoint me, <<$pcs_nickname>>. I thought you were one of us.', 'How can you not know, do you people not notice what''s happening around you?')+'" he says in an exasperated voice.'
+					'"I don''t believe it. '+iif(grupTipe = 3 or  nerd_game['stage'] > 0, 'You disappoint me, <<$pcs_nickname>>. I thought you were one of us.', 'How can you not know, do you people not notice what''s happening around you?')+'" he says in an exasperated voice.'
 					'But before he can explain further, a voice behind him calls out. "Geralt, my friend!"'
 					'Feofan turns around. "Dandelion!" he says to a boy you don''t know, also dressed up. They start talking and Feofan completely forgets about you and Katja.'
 					act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
@@ -565,7 +565,7 @@ if $ARGS[0] = 'coffee_hole_event':
 					act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'					
 				end
 			end
-		elseif katjQW['coffee_hole_rand'] = 4:
+		elseif katjaQW['coffee_hole_rand'] = 4:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 			if katjaQW['know_dandd'] = 0:
 				'"Have you heard that the nerds from our high school meet here every week?" Katja asks. But before you can answer, she continues, "They are playing some kind of game, dragons and elves or something like that. Julia tried to explain it to me, but I didn''t really get what it was about."'
@@ -596,7 +596,7 @@ if $ARGS[0] = 'coffee_hole_event':
 					act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
 				end
 			end
-		elseif katjQW['coffee_hole_rand'] = 5:
+		elseif katjaQW['coffee_hole_rand'] = 5:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 			if $university['enrolled_in'] = 'teaching_studies':
 				'"I thought the class that Professor Kovalyov gave the other day was really good," Katja says. "He really underscored the the point, and the example he used really clarified the theory. I''m glad we have professors like him."'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'coffee_hole_event':
 				'Katja explains what she learned to you.'
 			end
 			act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
-		elseif katjQW['coffee_hole_rand'] = 6:
+		elseif katjaQW['coffee_hole_rand'] = 6:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 			if $university['enrolled_in'] = 'teaching_studies':
 				'"I hate to say it but the lecture Professor Kovalchuk gave the other day was very boring," Katja says. "It''s not that it was difficult, and the subject is interesting, but the way she lectures just makes you want to sleep."'
@@ -616,7 +616,7 @@ if $ARGS[0] = 'coffee_hole_event':
 				'Katja explains all the things she thinks the professor does wrong, and how she could improve.'
 			end
 			act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
-		elseif katjQW['coffee_hole_rand'] = 7:
+		elseif katjaQW['coffee_hole_rand'] = 7:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 			'"Do you think I''m getting fat?" Katja suddenly asks.'
 			'"No, of course not. You are still gorgeous," you quickly say.'

locations/katja_city.qsrc

@@ -56,6 +56,43 @@ if $ARGS[0] = 'metro_destination':
 		gs 'stat'
 		'You exit the metro station and walk to the Galleria shopping mall.' 
 		act 'Start shopping': gt 'katja_chat', 'chat1'
+	elseif locat['katja'] = 53:
+		minut += 10
+		$loc = 'city_nightclub'
+		$loc_arg = 'start'
+		$menu_loc = 'city_nightclub'
+		$menu_arg = 'start'
+		menu_off = 0
+		$location_type = 'public_outdoors'
+		$sexloc = 'city_nightclub'
+		gs 'stat'
+		gs 'themes', 'indoors'
+		'You exit the metro station and walk to the nightclub, and get in line.'
+		if hotcat = 10:
+			'The bouncer almost immediately spots the two of you and lets you in, jumping in from of the long line and you can hear several complaints, but also some whitling and more lewd comments.'
+		elseif hotcat > 7:
+			minut += 5
+			'The two of you stand stand in line for a Shor while, before the bouncer singles you out, and you get to jump a head  of several people to their complaints.'
+		elseif hotcat > 5:
+			minut += 10
+			'You wait in line for some time, but finally it is your turn to be let in.'
+		else
+			minut += rand(15,20)
+			'You wait in line for a long time, while several girls are allowed to jump a head of you. BUt finally you are allowed in.'
+		end
+		if money >= 250:
+			money -= 250
+			'You pay the fee of 250<b>₽</b>, and go into the club.'
+		else
+			'Turns out you don''t have enough to pay for the entrance fee, so Katja pays for you telling you that next time you will have to pay.'
+		end
+		if rand(0,1) = 0:
+			'"Let''s start by go dancing" Katja says when you are finally inside the club and start to drag you to the dance floor.'
+			act 'Go to the dance floor': gt 'katja_nightclub', 'dance'
+		else
+			'"Let''s start by having a drink" Katja says when you are finally inside the club and start to drag you to the bar.'
+			act 'Go to the bar': gt 'katja_nightclub', 'bar_arrive'
+		end
 	else
 		if katjaQW['on_date'] = 1:
 			katjaQW['on_date'] = 0

locations/katja_city_sex.qsrc

@@ -11,16 +11,16 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 	$location_type = 'indoors'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/drinking_wine.jpg"></center>'
-	'While you walk through the streets, the guy introduces himself as <<$boyname>>, before you and Katja tell him your names.'
+	'While you walk through the streets, the guy introduces himself as <<$npc_nickname[$npclastgenerated]>>, before you and Katja tell him your names.'
 	*nl
 	'It doesn''t take long before you arrive at his building and he shows you up to his rather nice apartment.'
 	'"Let''s get a glass of vine and get comfortable," he says as he gets 3 glasses and a bottle of white wine from his fridge. Meanwhile, you and Katja'+iif(temper <20, ' take off your coats and ', ' ')+'sit down.'
 	if katjaQW['QWstage'] = 5:
-		'Soon, you are relaxing and having some wine. <<$boyname>>''s free hand gently caresses both your and Katja''s thighs from time to time.'
+		'Soon, you are relaxing and having some wine. <<$npc_nickname[$npclastgenerated]>>''s free hand gently caresses both your and Katja''s thighs from time to time.'
 		'It''s clear that Katja is nervous; each time he touches her, she jumps slightly, but she doesn''t try to stop him.'
 		'He takes her reaction as a sign to not go any further, so he simply continues to caress her thighs while she keeps squirming.'
 		'You''ll have to do something if this is going to lead anywhere.'
-		act 'Make out with <<$boyname>>': gt 'katja_city_sex', 'first_time'
+		act 'Make out with <<$npc_nickname[$npclastgenerated]>>': gt 'katja_city_sex', 'first_time'
 	else
 		if rand(0,4) = 0:
 			'When he comes back, he has a small bag of white powder. "I brought us this to make things more fun," he says, holding the the bag of cocaine.'
@@ -31,12 +31,12 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 					katjaQW['horny'] -= 20
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 					'"No. I don''t want any of that. And if you use it, I''m out of here," Katja says very harshly.'
-					'"OK, OK. I''ll put it away," <<$boyname>> says and leaves the room to hide his drugs.'
+					'"OK, OK. I''ll put it away," <<$npc_nickname[$npclastgenerated]>> says and leaves the room to hide his drugs.'
 					*nl
-					'Katja has relaxed by the time he comes back, and you start to enjoy sipping your wine and making small talk. <<$boyname>>''s free hand gently caresses your and Katja''s thighs from time to time. Katja returns his touch and you do the same.'
-					if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100): 
+					'Katja has relaxed by the time he comes back, and you start to enjoy sipping your wine and making small talk. <<$npc_nickname[$npclastgenerated]>>''s free hand gently caresses your and Katja''s thighs from time to time. Katja returns his touch and you do the same.'
+					if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['horny'] >= rand(70,100): 
 						'After a short while of this, Katja asks, "Why don''t you show us your bedroom?"'
-						'<<$boyname>> quickly gets up. "Right this way."'
+						'<<$npc_nickname[$npclastgenerated]>> quickly gets up. "Right this way."'
 						act 'Go to his bedroom': gt 'katja_city_sex', 'one_guy_start'
 					else
 						'After short while of touching, you think that it''s time to speed things up. In your most seductive voice, you say, "Maybe you could show us the rest of your apartment."'
@@ -74,7 +74,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/drugs/cocaine.jpg"></center>'
 							'You take the tube and snort the first line and then the second, while Katja looks at you with wide open eyes.'
-							'After a short moment, it hits you and you feel the full effect of the drug. <<$boyname>> takes the tube from you and tries to hand it to Katja, but she doesn''t take it. "I don''t do drugs. I''ve never done it before."'
+							'After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube from you and tries to hand it to Katja, but she doesn''t take it. "I don''t do drugs. I''ve never done it before."'
 							if func('katja_procedural', 'willing_to_be_naughty') < 85:
 								gs 'willpower', 'drugs', 'force', 'hard'
 							else
@@ -94,7 +94,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 									'"I''m still not sure. Why should I do it?" she asks.'
 									'"Because it feels great. You can''t say it''s not for you until you actually know how it feels," you say.'
 									*nl
-									'"OK," Katja finally relents. With a shaking hand, she takes the tube. She then places it at her nostril and slowly bends down so the other end is at the line of cocaine that <<$boyname>> prepared for her.'
+									'"OK," Katja finally relents. With a shaking hand, she takes the tube. She then places it at her nostril and slowly bends down so the other end is at the line of cocaine that <<$npc_nickname[$npclastgenerated]>> prepared for her.'
 									'She slowly starts sniffing it but jerks her head back when the powder starts to itch in her nose. "Do it, faster. All at once!" you tell her, and she gets down again, still shaking and gets ready.'
 									'This times she snorts it all in on go, and raises her head from the table. It''s clear that the powder itches her nostrils and she looks like she is about to sneeze. "Don''t sneeze! Keep it in!" you tell her, and Katja moves her hand to her nose to prevent it from coming out.'
 									*nl
@@ -109,7 +109,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							act 'Don''t push Katja':
 								cla
 								minut += 2
-								'"It''s fine if you don''t want to, Katja," you say. She seems relieved. <<$boyname>> doesn''t say anything and just cleans up the drugs.'
+								'"It''s fine if you don''t want to, Katja," you say. She seems relieved. <<$npc_nickname[$npclastgenerated]>> doesn''t say anything and just cleans up the drugs.'
 								act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 							end
 						end
@@ -139,7 +139,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/drugs/cocaine.jpg"></center>'
 							'"I''ll take some, but I don''t think my friend will," you say as you take the tube while Katja nods her head. You put one end of the tube to your nose and the other to the first of the lines he has prepared for you.' 
-							'You snort the first line and then the second while Katja looks at you with wide open eyes. After a short moment, it hits you and you feel the full effect of the drug. <<$boyname>> takes the tube and cleans up the drugs.'
+							'You snort the first line and then the second while Katja looks at you with wide open eyes. After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube and cleans up the drugs.'
 							act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 						end
 						if katjaQW['coke_stage'] = 2:
@@ -162,14 +162,14 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
 								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
-								'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$boyname>>.'
+								'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 								'She still looks skeptical. "I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea," she replies.'
 								'"You liked it last time! it will be fine this time, too," you continue.'
 								'"I''m not sure. '+iif(katjaQW['coke_stage'] = 2, 'I don''t want it to become a habit', 'I think the last time was enough for me')+'," she says.' 
 								'"Don''t be such a bore. You know you will love it," you say.'
 								'Katja finally relents. "OK. Let''s do it, together," she says.'
 								*nl
-								'<<$boyname>> has already produced another tube and hands it to Katja, who takes it with unsteady hands. You both lower your heads to the table.'
+								'<<$npc_nickname[$npclastgenerated]>> has already produced another tube and hands it to Katja, who takes it with unsteady hands. You both lower your heads to the table.'
 								'Then at the same time, you sniff your lines. Katja '+iif(katjaQW['coke_stage'] = 2, 'has gotten used to it and it doesn''t itch her nostrils anymore.', 'is still getting itching nostrils and has to concentrate on not sneezing.')
 								*nl
 								'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. Then she starts giggling, which turns into a laugh that lasts for some time.'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 										iif(katjaQW['coke_stage'] = 3, 'Katja looks at you. "Do you think I take too much?"', 'Katja scowls at you. "Are you implying I can''t control myself?"')
 										'"I''m just saying that maybe we should relax a little. Right now isn''t the time for this," you say.'
 										'Katja thinks about it for a moment. '+iif(katjaQW['coke_stage'] = 3, '"OK. Not tonight," she says.', '"Fine," she says, clearly not happy about it.')
-										'"Well, more for me then," <<$boyname>> says and does a few more lines before packing away the drugs.'
+										'"Well, more for me then," <<$npc_nickname[$npclastgenerated]>> says and does a few more lines before packing away the drugs.'
 										act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 									end
 								else
@@ -223,7 +223,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 									gs 'katja_procedural', 'take_cocaine'
 									gs 'stat'										
 									'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
-									'You watch as Katja takes the tube, puts one end at her nose and bends down to the start of the line that <<$boyname>> has prepared for her.'
+									'You watch as Katja takes the tube, puts one end at her nose and bends down to the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
 									'She then sniffs the line with no problem and just sits up waiting for the the drugs to hit her.' 
 									*nl
 									'After a moment, it does and Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
@@ -241,8 +241,8 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
 							'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
-							'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$boyname>>.'
-							'She agrees and <<$boyname>> hands her another tube and Katja takes it happily.'
+							'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
+							'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube and Katja takes it happily.'
 							'You put your tubes to your nostrils and lower your heads to the table and sniff your line. Katja does it with great enthusiasm.' 
 							*nl
 							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
@@ -296,7 +296,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 											'"You aren''t my mom!" Katja says.'
 											'"No, I''m not. But I''m sure she would be harsher with you than I am," you answer.'
 											'Katja is silently thinking about it for a moment. "Fine. You get it your way, this time," she says, clearly not happy about it.'
-											'"Well, more for me then," <<$boyname>> says and does a few more lines before packing away the drugs. Katja looks longingly at the drugs while he''s doing so.'
+											'"Well, more for me then," <<$npc_nickname[$npclastgenerated]>> says and does a few more lines before packing away the drugs. Katja looks longingly at the drugs while he''s doing so.'
 											act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 										end
 									else
@@ -309,7 +309,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 									gs 'katja_procedural', 'take_cocaine'
 									gs 'stat'										
 									'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
-									'You watch as Katja takes the tube, puts one end at her nose and bends down so the other end is at the start of the line that <<$boyname>> has prepared for her.'
+									'You watch as Katja takes the tube, puts one end at her nose and bends down so the other end is at the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
 									'She then sniffs the line like a pro and sits up, waiting for the the drugs to hit her.' 
 									*nl
 									'After a moment, it does and Katja sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
@@ -328,7 +328,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							gs 'stat'										
 							'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 							'"Okay, Katja. Let''s do it together," you say.'
-							'"Yes! That''s the spirit," she replies as she has already taken the tube from <<$boyname>>. He quickly produces another one and hands it to you.'
+							'"Yes! That''s the spirit," she replies as she has already taken the tube from <<$npc_nickname[$npclastgenerated]>>. He quickly produces another one and hands it to you.'
 							'You both put your tubes to your nostrils and lower your heads to the table and sniff your lines. Katja does it like it''s something she does all the time.' 
 							*nl
 							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
@@ -338,10 +338,10 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 				end
 			end
 		else
-			'Soon, you are relaxing and having some wine. <<$boyname>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja return his touch and you do the same.'
-			if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100): 
+			'Soon, you are relaxing and having some wine. <<$npc_nickname[$npclastgenerated]>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja return his touch and you do the same.'
+			if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['horny'] >= rand(70,100): 
 				'After a short while of touching, Katja asks, "Why don''t you show us your bedroom?"'
-				'<<$boyname>> quickly gets up and says, "Right this way."'
+				'<<$npc_nickname[$npclastgenerated]>> quickly gets up and says, "Right this way."'
 				act 'Go to his bedroom': gt 'katja_city_sex', 'one_guy_start'
 			else
 				'After a short while of touching, you think that it''s time to advance this and say in your most seductive voice, "Maybe you should show us the rest of your apartment."'
@@ -354,10 +354,10 @@ end
 
 if $ARGS[0] = 'after_drugs':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy<<rand(1,2)>>.jpg"></center>'
-	'Soon you are relaxing and having some wine. <<$boyname>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja return his touch and you do the same.'
-	if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100): 
+	'Soon you are relaxing and having some wine. <<$npc_nickname[$npclastgenerated]>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja return his touch and you do the same.'
+	if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['horny'] >= rand(70,100): 
 		'After a short while of touching, Katja asks, "Why don''t you show us your bedroom?"'
-		'<<$boyname>> quickly gets up and says, "Right this way."'
+		'<<$npc_nickname[$npclastgenerated]>> quickly gets up and says, "Right this way."'
 		act 'Go to his bedroom': gt 'katja_city_sex', 'one_guy_start'
 	else
 		'After a short while of touching, you think that it''s time to advance this and say in your most seductive voice, "Maybe you should show us the rest of your apartment."'
@@ -371,7 +371,7 @@ if $ARGS[0] = 'first_time':
 	katjaQW['horny'] += rand(5,10)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/kiss_guy_katja_watch.jpg"></center>'
-	'You take the initiative, and bring <<$boyname>>''s face to yours and start to kiss him. Suddenly, his hands are all over your body.'
+	'You take the initiative, and bring <<$npc_nickname[$npclastgenerated]>>''s face to yours and start to kiss him. Suddenly, his hands are all over your body.'
 	'You slowly unbutton his shirt and start caressing his bare chest. All the while, Katja looks on intensely, pressing her thighs together, clearly getting aroused.'
 	act 'Katja''s turn':
 		*clr & cla
@@ -379,26 +379,26 @@ if $ARGS[0] = 'first_time':
 		katjaQW['horny'] += rand(10,20)
 		gs 'stat'	
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
-		'You gently push <<$boyname>> away and stand up in front of Katja and stretch your hand out to her. She takes it and you pull her up in your arms and start to kiss her deeply.'
+		'You gently push <<$npc_nickname[$npclastgenerated]>> away and stand up in front of Katja and stretch your hand out to her. She takes it and you pull her up in your arms and start to kiss her deeply.'
 		'You gently caress her body, and she does the same to you. After a short while, you start to slowly remove her dress and she reciprocates.'
 		'Soon, you are both standing naked in the apartment of a man you just met a short time ago, and it seems that when this realization hits Katja, she starts to giggle.'
-		'To not ruin the mood, you quickly turn to <<$boyname>> and ask in your most seductive voice, "Maybe you could show us the rest of your apartment."'
+		'To not ruin the mood, you quickly turn to <<$npc_nickname[$npclastgenerated]>> and ask in your most seductive voice, "Maybe you could show us the rest of your apartment."'
 		'He gets your intention. "Of course, follow me. Let''s start with the bedroom," he says as he shows you the way.'
 		act 'Go to his bedroom':
 			*clr & cla
 			gs 'arousal', 'kiss', 3, 'group', 'lesbian'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex1.jpg"></center>'
-			'<<$boyname>>''s bedroom is, like the rest of his apartment, quite nice. The center of the room, his bed, is ready for action.'
+			'<<$npc_nickname[$npclastgenerated]>>''s bedroom is, like the rest of his apartment, quite nice. The center of the room, his bed, is ready for action.'
 			'"Nice bed," you say. "Let''s see if it''s as soft as it looks," you continue, and crawl up on the bed with Katja following you.'
-			'"Let''s show <<$boyname>> what he has to look forward to," you whisper to Katja as you get up on all four displaying your behind to <<$boyname>>.'
-			'Katja does the same and <<$boyname>> says, "What a fantastic view!" Katja leans in and gives you a soft kiss, and you can hear <<$boyname>> stripping his clothes off behind you.'
+			'"Let''s show <<$npc_nickname[$npclastgenerated]>> what he has to look forward to," you whisper to Katja as you get up on all four displaying your behind to <<$npc_nickname[$npclastgenerated]>>.'
+			'Katja does the same and <<$npc_nickname[$npclastgenerated]>> says, "What a fantastic view!" Katja leans in and gives you a soft kiss, and you can hear <<$npc_nickname[$npclastgenerated]>> stripping his clothes off behind you.'
 			act 'Start by sucking his dick':
 				*clr & cla
 				gs 'arousal', 'bj', 3, 'group'
 				gs 'stat'			
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex2.jpg"></center>'			
-				'"This is a really comfortable bed. Why don''t you join us?" you ask and <<$boyname>> immediately lies down on the bed between Katja and yourself.'
+				'"This is a really comfortable bed. Why don''t you join us?" you ask and <<$npc_nickname[$npclastgenerated]>> immediately lies down on the bed between Katja and yourself.'
 				'You sit down and start licking the sides of his <<dick>> cm <<$dick_girth>> cock, while Katja looks on nervously.'
 				'"Come on, Katja! You have to try this," you tell her and hold the dick to her. She slowly gets closer and sticks out her tongue and begins licking his cock very carefully.'
 				'You look at her for some time, and when she starts being more comfortable, you join her and you both lick his dick at the same time.' 
@@ -406,8 +406,8 @@ if $ARGS[0] = 'first_time':
 					*clr & cla
 					katjaQW['horny'] += rand(5,10)
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex3.jpg"></center>'
-					'"Time for you to see how sex works," you tell Katja as you remove your mouth from <<$boyname>>''s cock. Katja sits up and looks at you with interest.'
-					'You climb up on <<$boyname>> and sit down on his <<$dick_girth>> cock and start riding him cowgirl style.'
+					'"Time for you to see how sex works," you tell Katja as you remove your mouth from <<$npc_nickname[$npclastgenerated]>>''s cock. Katja sits up and looks at you with interest.'
+					'You climb up on <<$npc_nickname[$npclastgenerated]>> and sit down on his <<$dick_girth>> cock and start riding him cowgirl style.'
 					'Katja gets close and looks intently at his cock going in and out of your pussy.'
 					gs 'arousal', 'vaginal', 3, 'group'
 					gs 'stat'
@@ -417,19 +417,19 @@ if $ARGS[0] = 'first_time':
 						katjaQW['horny'] += rand(10,20)
 						gs 'stat'	
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex4.jpg"></center>'
-						'You scoot forward and <<$boyname>>''s cock pops out of your pussy. "Why don''t you suck on his cock some more, Katja?" you ask the redhead.'
-						'Katja does as you ask and '+iif(npc_throat['A14'] < dick/2, 'tries to take', 'takes')+' <<$boyname>>''s  <<$dick_girth>> dick in her mouth.'
+						'You scoot forward and <<$npc_nickname[$npclastgenerated]>>''s cock pops out of your pussy. "Why don''t you suck on his cock some more, Katja?" you ask the redhead.'
+						'Katja does as you ask and '+iif(npc_throat['A14'] < dick/2, 'tries to take', 'takes')+' <<$npc_nickname[$npclastgenerated]>>''s  <<$dick_girth>> dick in her mouth.'
 						if npc_throat['A14'] < dick/2:
 							katjaQW['slut'] -= 2
 							'Katja continues to try to suck his cock, but she''s clearly having problems with getting it into her mouth, and after trying for a few minutes, she gives up.'
 						elseif npc_throat['A14'] < dick:
-							'Katja starts to blow <<$boyname>> but she''s clearly having problems with taking all of his cock, and after trying for a few minutes, she gives up.'
+							'Katja starts to blow <<$npc_nickname[$npclastgenerated]>> but she''s clearly having problems with taking all of his cock, and after trying for a few minutes, she gives up.'
 						elseif npc_throat['A14'] < 2*dick:
 							katjaQW['slut'] += 2
-							'Katja starts to blow <<$boyname>> and she''s able to take most of his cock without a problem. After sucking him for a few minutes, she stops.'
+							'Katja starts to blow <<$npc_nickname[$npclastgenerated]>> and she''s able to take most of his cock without a problem. After sucking him for a few minutes, she stops.'
 						else
 							katjaQW['slut'] += 4
-							'Katja starts to blow <<$boyname>> and she''s able to take all of his cock like a pro. After sucking him for a few minutes, she stops.'
+							'Katja starts to blow <<$npc_nickname[$npclastgenerated]>> and she''s able to take all of his cock like a pro. After sucking him for a few minutes, she stops.'
 						end
 						if npc_throat['A14'] < dick: npc_throat['A14'] += 1
 						act 'Get on your back':
@@ -437,8 +437,8 @@ if $ARGS[0] = 'first_time':
 							katjaQW['horny'] += rand(5,10)
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex5.jpg"></center>'
 							'"Come, Katja, sit on your knees right here," you tell Katja and point at a spot on the bed. She does as you say, then you lie on your back and put your head in her lap.'
-							'"Hold my legs," you tell her, as you spread and lift them in the air to give <<$boyname>> full access to your pussy.'
-							'"Look carefully, Katja, this is what''s going to happen to you next," you say as <<$boyname>> puts his cook in your pussy and start thrusting.'
+							'"Hold my legs," you tell her, as you spread and lift them in the air to give <<$npc_nickname[$npclastgenerated]>> full access to your pussy.'
+							'"Look carefully, Katja, this is what''s going to happen to you next," you say as <<$npc_nickname[$npclastgenerated]>> puts his cook in your pussy and start thrusting.'
 							'Katja looks intently at his cock pumping in and out of your wet pussy.'
 							gs 'arousal', 'vaginal', 3, 'group'
 							gs 'stat'
@@ -448,33 +448,33 @@ if $ARGS[0] = 'first_time':
 								gs 'arousal', 'erotic_nudity', 3, 'group'
 								gs 'stat'	
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex6.jpg"></center>'
-								'After a few minutes, you stop <<$boyname>> and after he pulls out, you look up at Katja. "Your turn now."'
-								'You switch places with her and hold up her legs to give <<$boyname>> access. You look at Katja to see how she handles her first cock.'
-								'<<$boyname>> then places the head of his cock at Katja''s vaginal opening, and she looks at it nervously and stammers, "Be careful... It''s my... first... time."'
-								'"I will. Don''t worry, I''ll take good care of you," <<$boyname>> says before he pushes his cock into her pussy.'
+								'After a few minutes, you stop <<$npc_nickname[$npclastgenerated]>> and after he pulls out, you look up at Katja. "Your turn now."'
+								'You switch places with her and hold up her legs to give <<$npc_nickname[$npclastgenerated]>> access. You look at Katja to see how she handles her first cock.'
+								'<<$npc_nickname[$npclastgenerated]>> then places the head of his cock at Katja''s vaginal opening, and she looks at it nervously and stammers, "Be careful... It''s my... first... time."'
+								'"I will. Don''t worry, I''ll take good care of you," <<$npc_nickname[$npclastgenerated]>> says before he pushes his cock into her pussy.'
 								act 'Penetration':
 									*clr & cla
 									if npc_vag['A14'] = 0:
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7a.jpg"></center>'
 										katjaQW['horny'] -= rand(20,40)
 										katjaQW['slut'] -= 5
-										'<<$boyname>> slowly guides his cock into Katja, who''s clearly feeling uncomfortable with it. He comes to a halt; apparently he has reached her hymen.'
+										'<<$npc_nickname[$npclastgenerated]>> slowly guides his cock into Katja, who''s clearly feeling uncomfortable with it. He comes to a halt; apparently he has reached her hymen.'
 										'Katja looks at him with big eyes, but she lets out a shriek of pain and throws her head back when he suddenly thrusts forward.'
-										'<<$boyname>> just keeps his cock still for a time while Katja''s pain subsides and her breathing returns to normal.'
+										'<<$npc_nickname[$npclastgenerated]>> just keeps his cock still for a time while Katja''s pain subsides and her breathing returns to normal.'
 										'Finally, she says in a small voice, "You can... go on," and he then slowly continues to push his cock into her.'
 										'It''s clear she is still feeling some pain, but before long, he pulls out and slowly pushes in again, and Katja''s discomfort seems to be disappearing.'
 									elseif npc_vag['A14'] < dick:
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7a.jpg"></center>'
 										katjaQW['horny'] += rand(5,10)
 										katjaQW['slut'] -= 2
-										'<<$boyname>> slowly guides his cock into Katja who''s clearly feeling some pain. But when he seems to stop, Katja says, "You can... go on."'
+										'<<$npc_nickname[$npclastgenerated]>> slowly guides his cock into Katja who''s clearly feeling some pain. But when he seems to stop, Katja says, "You can... go on."'
 										'So he slowly continues to push his cock into her, and before long, his cock is fully  burrowed her pussy.'
 										'It is clear that she is still feeling some pain, but before long, he pulls out and slowly pushes in again, and Katja''s discomfort seems to be disappearing.'
 									else									
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7b.jpg"></center>'
 										katjaQW['horny'] += rand(20,40)
 										katjaQW['slut'] += 2
-										'<<$boyname>> slowly guides his cock into Katja, who looks on with big eyes.'
+										'<<$npc_nickname[$npclastgenerated]>> slowly guides his cock into Katja, who looks on with big eyes.'
 										'To what looks like his surprise, he meets very little resistance, and soon his cock is fully burrowed in her pussy.'
 										'Katja just looks on in amazement the whole time and as he pulls out and pushes in again, she starts to moan.'
 									end
@@ -487,7 +487,7 @@ if $ARGS[0] = 'first_time':
 										katjaQW['horny'] += rand(5,10)
 										katjaQW['slut'] += 2
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex8.jpg"></center>'
-										'"Come on, move faster... Fuck me!" Katja moans and <<$boyname>> does not need to be asked twice.'
+										'"Come on, move faster... Fuck me!" Katja moans and <<$npc_nickname[$npclastgenerated]>> does not need to be asked twice.'
 										'He starts pounding her, even moving one of his feet on the bed so he can go deeper. While you look at Katja, who''s writhing in '+iif(npc_vag['A14'] < dick, 'pain and pleasure', 'pleasure')+', moaning louder and louder.'
 										gs 'arousal', 'erotic_nudity', 3, 'group'
 										gs 'stat'	
@@ -496,9 +496,9 @@ if $ARGS[0] = 'first_time':
 											katjaQW['horny'] += rand(5,10)
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex9.jpg"></center>'
 											'After a few minutes of pounding, '+iif( katjaQW['horny'] >= 100, 'she lets out a huge moan, seemingly having an orgasm', 'seems to have gotten enough')+' and says, "Enough! I need break."'
-											'<<$boyname>> pulls out and he, too, seems exhausted, so you tell him, "Lay down, I''ll take care of you".'
+											'<<$npc_nickname[$npclastgenerated]>> pulls out and he, too, seems exhausted, so you tell him, "Lay down, I''ll take care of you".'
 											'He lies down on his back. You climb on top and start riding his hard cock.'
-											'After a short moment, Katja seems to have gathered her strength and stands up on the bed. She guides your mouth to her pussy and you start eating her out while you bounce up and down on <<boyname>>''s cock.' 
+											'After a short moment, Katja seems to have gathered her strength and stands up on the bed. She guides your mouth to her pussy and you start eating her out while you bounce up and down on <<$npc_nickname[$npclastgenerated]>>''s cock.' 
 											if katjaQW['horny'] >= 100: katjaQW['horny'] - 100 & katjaQW['slut'] += 2
 											gs 'arousal', 'vaginal', 3, 'group'
 											gs 'arousal', 'cuni_give', -2, 'group', 'lesbian'
@@ -516,8 +516,8 @@ if $ARGS[0] = 'first_time':
 													*clr & cla
 													katjaQW['horny'] += rand(5,10)
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex11.jpg"></center>'
-													'"This isn''t working. Get off," <<$boyname>> says after a few minutes of awkward sex and Katja obliges.'
-													'"You," he points at you. "Get down on all four and shove that <<$pc_desc[''butt'']>> ass in the air," <<$boyname>> commands.'
+													'"This isn''t working. Get off," <<$npc_nickname[$npclastgenerated]>> says after a few minutes of awkward sex and Katja obliges.'
+													'"You," he points at you. "Get down on all four and shove that <<$pc_desc[''butt'']>> ass in the air," <<$npc_nickname[$npclastgenerated]>> commands.'
 													'You do as he says and he climbs on and starts to pound you, deep and hard. Katja lies down and starts to play with your clit while you get fucked.'
 													gs 'arousal', 'vaginal', 3, 'group'
 													gs 'arousal', 'clit_finger', -2, 'group', 'lesbian'
@@ -526,13 +526,13 @@ if $ARGS[0] = 'first_time':
 														*clr & cla
 														katjaQW['horny'] += rand(10,20)
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex12.jpg"></center>'
-														'"I want to fuck the redhead again, before I cum," <<$boyname>> says as he gets off you. Katja quickly takes your position.'
+														'"I want to fuck the redhead again, before I cum," <<$npc_nickname[$npclastgenerated]>> says as he gets off you. Katja quickly takes your position.'
 														'He mounts her and starts moving like a piston. You crawl under them so you can look at his cock ravaging Katja''s pussy while she moans loudly.'
 														if katjaQW['horny'] >= 100:
 															katjaQW['horny'] = 0
 															katjaQW['slut'] += 3
 															'After a short while, Katja yells out that she''s cumming and she has a huge, explosive orgasm, squirting all over your face.'
-															'Just a short moment afterward, <<$boyname>> jumps off and yells, "Get down on your knees, I want to cum on your faces!".'
+															'Just a short moment afterward, <<$npc_nickname[$npclastgenerated]>> jumps off and yells, "Get down on your knees, I want to cum on your faces!".'
 														else
 															'He continues to pound her for a couple of minutes before he jumps off and yells, "Get down on your knees, I want to cum on your faces!"'
 														end
@@ -543,7 +543,7 @@ if $ARGS[0] = 'first_time':
 															'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex12.jpg"></center>'
 															'You do as he says and quickly get on the floor just in time as his cum starts spraying out over both of your faces.'
 															'He cums '+iif(rand(0,1) > 0, 'a lot', 'with a couple of spurts')+'. You start to lick off the cum on Katja''s face, and she returns the favor.'
-															'You continue to make out for a while. When you get up, <<$boyname>> has laid down on his bed, looking very exhausted.'
+															'You continue to make out for a while. When you get up, <<$npc_nickname[$npclastgenerated]>> has laid down on his bed, looking very exhausted.'
 															'"We will have to use your bathroom," you tell him and he just waves his hand in its direction.' 
 															gs 'arousal', 'kiss', 3, 'lesbian'
 															gs 'arousal', 'end'
@@ -557,10 +557,10 @@ if $ARGS[0] = 'first_time':
 																'On the way to the bathroom, you pick up your clothes. Then spend some minutes cleaning the rest of his cum off your faces.'
 																'You don''t talk much while you fix up your makeup and get dressed again.'
 																if rand(0,1) = 0:
-																	'When you return to <<$boyname>>, he has fallen asleep, so you and Katja decide to see yourself out.'
+																	'When you return to <<$npc_nickname[$npclastgenerated]>>, he has fallen asleep, so you and Katja decide to see yourself out.'
 																else
-																	'When you return to <<$boyname>>, he lies still on the bed, exhausted. "Thanks for a great time. We''ll be going now," you say while Katja has grown very quiet.'
-																	'"OK, and it''s me who owes you for a fantastic time. Hope you can see yourself out," <<$boyname>> answers.'
+																	'When you return to <<$npc_nickname[$npclastgenerated]>>, he lies still on the bed, exhausted. "Thanks for a great time. We''ll be going now," you say while Katja has grown very quiet.'
+																	'"OK, and it''s me who owes you for a fantastic time. Hope you can see yourself out," <<$npc_nickname[$npclastgenerated]>> answers.'
 																end
 																act 'Leave the apartment': gt 'katja_city_sex', 'going_home'
 															end
@@ -585,28 +585,28 @@ if $ARGS[0] = 'one_guy_start':
 	gs 'arousal', 'kiss', 3, 'group', 'lesbian'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex1.jpg"></center>'
-	'<<$boyname>>''s bedroom is, like the rest of his apartment, quite nice. The center of the room, his bed, is ready for action.'
+	'<<$npc_nickname[$npclastgenerated]>>''s bedroom is, like the rest of his apartment, quite nice. The center of the room, his bed, is ready for action.'
 	'"Nice bed," you say. "Let''s see if it''s as soft as it looks," you continue, and crawl up on the bed with Katja following you.'
-	'"It''s very hot in here, I think I need to lose some of these worm clothes," '+iif(func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100), 'Katja says', 'you say')+', and you both proceed to take off your clothes.'
-	'"Let''s show <<$boyname>> what he has to look forward to," you whisper to Katja as you get up on all four, displaying your behind to <<$boyname>>.'
-	'Katja does the same and <<$boyname>> says, "What a fantastic view!"'
+	'"It''s very hot in here, I think I need to lose some of these worm clothes," '+iif(func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['horny'] >= rand(70,100), 'Katja says', 'you say')+', and you both proceed to take off your clothes.'
+	'"Let''s show <<$npc_nickname[$npclastgenerated]>> what he has to look forward to," you whisper to Katja as you get up on all four, displaying your behind to <<$npc_nickname[$npclastgenerated]>>.'
+	'Katja does the same and <<$npc_nickname[$npclastgenerated]>> says, "What a fantastic view!"'
 	'Katja leans in and gives you a soft kiss, and you hear clothes being taken off behind you.'
 	act 'Start by sucking his dick':
 		*clr & cla
 		gs 'arousal', 'bj', 3, 'group'
 		gs 'stat'			
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex2.jpg"></center>'			
-		'"This is a really comfortable bed. Why don''t you join us?" '+iif(func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100), 'Katja asks.', 'you ask.')
-		'<<$boyname>> immediately lies down on the bed between Katja and yourself.'
+		'"This is a really comfortable bed. Why don''t you join us?" '+iif(func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['horny'] >= rand(70,100), 'Katja asks.', 'you ask.')
+		'<<$npc_nickname[$npclastgenerated]>> immediately lies down on the bed between Katja and yourself.'
 		'You and Katja both sit down and start licking the sides of his <<dick>> cm <<$dick_girth>> cock.'
 		act 'Time to fuck':
 			*clr & cla
 			katjaQW['horny'] += rand(5,10)
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex5.jpg"></center>'
-			'"Time to ride some cock!" you tell Katja as you remove your mouth from <<$boyname>>''s dick. Katja also stops licking.'
+			'"Time to ride some cock!" you tell Katja as you remove your mouth from <<$npc_nickname[$npclastgenerated]>>''s dick. Katja also stops licking.'
 			'"Come on, Katja. Sit on your knees, right here," you tell her and point at a spot on the bed. You lie on your back and put your head in her lap.'
-			'"Hold my legs," you tell Katja as you spread and lift them in the air to give <<$boyname>> full access to your pussy.'
-			'Katja looks intently as <<$boyname>> puts his cock in your pussy and starts fucking you.'
+			'"Hold my legs," you tell Katja as you spread and lift them in the air to give <<$npc_nickname[$npclastgenerated]>> full access to your pussy.'
+			'Katja looks intently as <<$npc_nickname[$npclastgenerated]>> puts his cock in your pussy and starts fucking you.'
 			gs 'arousal', 'vaginal', 3, 'group'
 			gs 'stat'
 			act 'Katja''s turn':
@@ -614,15 +614,15 @@ if $ARGS[0] = 'one_guy_start':
 				if npc_vag['A14'] < dick:
 					katjaQW['horny'] += rand(5,10)
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7a.jpg"></center>'
-					'After a few minutes, you stop <<$boyname>> and after he pulls out, you say, "Your turn now, Katja." You switch places with her and she holds up her legs to give <<$boyname>> access.'					
-					'<<$boyname>> guides his cock into Katja, who''s clearly feeling some pain. But when he seems to stop, Katja says, "You can... go on."'
+					'After a few minutes, you stop <<$npc_nickname[$npclastgenerated]>> and after he pulls out, you say, "Your turn now, Katja." You switch places with her and she holds up her legs to give <<$npc_nickname[$npclastgenerated]>> access.'					
+					'<<$npc_nickname[$npclastgenerated]>> guides his cock into Katja, who''s clearly feeling some pain. But when he seems to stop, Katja says, "You can... go on."'
 					'He slowly continues to push his cock into her and before long, his cock is fully burrowed in her pussy.'
 					'It''s clear that she''s still feeling some pain, but before long, he pulls out and slowly pushes in again, and Katja''s discomfort seems to be disappearing.'
 				else									
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7b.jpg"></center>'
 					katjaQW['horny'] += rand(20,40)
 					katjaQW['slut'] += 4
-					'<<$boyname>> guides his cock into Katja and when he meets very little resistance, he starts to fuck her just as hard as he did you.'
+					'<<$npc_nickname[$npclastgenerated]>> guides his cock into Katja and when he meets very little resistance, he starts to fuck her just as hard as he did you.'
 					'Katja  starts to moan and is clearly enjoying the fuck.'
 				end
 				if npc_vag['A14'] < dick: npc_vag['A14'] += 1
@@ -633,7 +633,7 @@ if $ARGS[0] = 'one_guy_start':
 					*clr & cla
 					katjaQW['horny'] += rand(5,10)
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex8.jpg"></center>'
-					'"Come on, move faster... Fuck me!" Katja moans and <<$boyname>> does not need to be asked twice.'
+					'"Come on, move faster... Fuck me!" Katja moans and <<$npc_nickname[$npclastgenerated]>> does not need to be asked twice.'
 					'He starts pounding her, even moving one foot onto the bed so he can go deeper. While you look at Katja writhing in '+iif(npc_vag['A14'] < dick, 'pain and pleasure', 'pleasure')+', moaning louder and louder.'
 					gs 'arousal', 'erotic_nudity', 3, 'group'
 					gs 'stat'	
@@ -642,9 +642,9 @@ if $ARGS[0] = 'one_guy_start':
 						katjaQW['horny'] += rand(5,10)
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex9.jpg"></center>'
 						'After a few minutes of pounding, '+iif( katjaQW['horny'] >= 100, 'she lets out a huge moan, seemingly having an orgasm', 'seems to have gotten enough')+' and says, "Enough. I need  break."'
-						'<<$boyname>> pulls out and also seems exhausted, so you tell him, "Lay down, and I''ll take care of you."'
+						'<<$npc_nickname[$npclastgenerated]>> pulls out and also seems exhausted, so you tell him, "Lay down, and I''ll take care of you."'
 						'He lies down on his back before you climb on top of him and start riding his hard cock.'
-						'After a short moment, Katja seems to have gathered her strength and stands on the bed. She guides your mouth to her pussy and you start eating her out while you bounce up and down on <<boyname>>''s cock.' 
+						'After a short moment, Katja seems to have gathered her strength and stands on the bed. She guides your mouth to her pussy and you start eating her out while you bounce up and down on <<$npc_nickname[$npclastgenerated]>>''s cock.' 
 						if katjaQW['horny'] >= 100: katjaQW['horny'] - 100 & katjaQW['slut'] += 2
 						gs 'arousal', 'vaginal', 3, 'group'
 						gs 'arousal', 'cuni_give', -2, 'group', 'lesbian'
@@ -655,25 +655,25 @@ if $ARGS[0] = 'one_guy_start':
 							katjaQW['horny'] += rand(10,20)
 							gs 'stat'	
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex4.jpg"></center>'
-							'After a while, you''ve also had enough and scoot forward and <<$boyname>>''s cock pops out of your pussy. "Why don''t you suck on his cock some more, Katja?"'
-							'Katja does as you say and '+iif(npc_throat['A14'] < dick/2, 'tries to take', 'takes')+' <<$boyname>>''s <<$dick_girth>> in her mouth.'
+							'After a while, you''ve also had enough and scoot forward and <<$npc_nickname[$npclastgenerated]>>''s cock pops out of your pussy. "Why don''t you suck on his cock some more, Katja?"'
+							'Katja does as you say and '+iif(npc_throat['A14'] < dick/2, 'tries to take', 'takes')+' <<$npc_nickname[$npclastgenerated]>>''s <<$dick_girth>> in her mouth.'
 							if npc_throat['A14'] < dick/2:
 								katjaQW['slut'] -= 2
 								'Katja continues to try to suck his cock, but is clearly having problems with getting it into her mouth, and after trying for a few minutes, she gives up.'
 							elseif npc_throat['A14'] < dick:
-								'Katja then starts to blow <<$boyname>> but is clearly having problems with taking all of his cock, and after trying for a few minutes, she gives up.'
+								'Katja then starts to blow <<$npc_nickname[$npclastgenerated]>> but is clearly having problems with taking all of his cock, and after trying for a few minutes, she gives up.'
 							elseif npc_throat['A14'] < 2*dick:
-								'Katja then starts to blow <<$boyname>> and is able to take most of his cock without a problem. After blowing him for a few minutes, she stops.'
+								'Katja then starts to blow <<$npc_nickname[$npclastgenerated]>> and is able to take most of his cock without a problem. After blowing him for a few minutes, she stops.'
 							else
 								katjaQW['slut'] += 2
-								'Katja then starts to blow <<$boyname>> and is able to take all of his cock like a pro. After blowing him for a few minutes, she stops.'
+								'Katja then starts to blow <<$npc_nickname[$npclastgenerated]>> and is able to take all of his cock like a pro. After blowing him for a few minutes, she stops.'
 							end
 							if npc_throat['A14'] < dick: npc_throat['A14'] += 1
 							act 'Switch again':
 								*clr & cla
 								katjaQW['horny'] += rand(5,10)
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex10.jpg"></center>'
-								if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100):
+								if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['horny'] >= rand(70,100):
 									'"My turn, now," Katja says and crawls up on him for a reverse cowgirl and guides his cock into her pussy.'
 								else
 									'"Your turn again, Katja." you say. "Try reverse cowgirl this time."'
@@ -686,8 +686,8 @@ if $ARGS[0] = 'one_guy_start':
 									*clr & cla
 									katjaQW['horny'] += rand(5,10)
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex11.jpg"></center>'
-									'"Let''s change position," <<$boyname>> says after a few minutes of sex and Katja obliges.'
-									'He points at you. "Get down on all fours and shove that <<$pc_desc[''butt'']>> ass in the air," <<$boyname>> commands.'
+									'"Let''s change position," <<$npc_nickname[$npclastgenerated]>> says after a few minutes of sex and Katja obliges.'
+									'He points at you. "Get down on all fours and shove that <<$pc_desc[''butt'']>> ass in the air," <<$npc_nickname[$npclastgenerated]>> commands.'
 									'You do as he says and he climbs on and starts to pound you deep and hard. Katja lies down and starts to play with your clit while you get fucked.'
 									gs 'arousal', 'vaginal', 3, 'group'
 									gs 'arousal', 'clit_finger', -2, 'group', 'lesbian'
@@ -696,13 +696,13 @@ if $ARGS[0] = 'one_guy_start':
 										*clr & cla
 										katjaQW['horny'] += rand(10,20)
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex12.jpg"></center>'
-										'"I need to fuck the redhead one last time before I cum," <<$boyname>> says as he gets off you, and Katja quickly takes your place.'
+										'"I need to fuck the redhead one last time before I cum," <<$npc_nickname[$npclastgenerated]>> says as he gets off you, and Katja quickly takes your place.'
 										'He mounts her and starts moving like a piston. You crawl under them so you can look at his cock ravaging Katja''s pussy while she moans loudly.'
 										if katjaQW['horny'] >= 100:
 											katjaQW['horny'] = 0
 											katjaQW['slut'] += 1
 											'After a short while, Katja screams that she''s coming and she has a huge, explosive orgasm, squirting all over your face.'
-											'Just a short moment afterward, <<$boyname>> jumps off and yells, "Get down on your knees, I want cum on your faces!"'
+											'Just a short moment afterward, <<$npc_nickname[$npclastgenerated]>> jumps off and yells, "Get down on your knees, I want cum on your faces!"'
 										else
 											'He continue to pound her for a couple of minutes before he jumps off and yells, "Get down on your knees, I want cum on your faces!"'
 										end
@@ -713,7 +713,7 @@ if $ARGS[0] = 'one_guy_start':
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex12.jpg"></center>'
 											'You do as he says and quickly get on the floor, and just in time, as his cum starts spraying out over both of your faces.'
 											'He cums '+iif(rand(0,1) > 0, 'a lot', 'with a couple of spurts')+'. You start to lick off the cum on Katja''s face, and she returns the favor.'
-											'You continue to make out for a while. When you get up, <<$boyname>> has laid down on his bed, looking very exhausted.'
+											'You continue to make out for a while. When you get up, <<$npc_nickname[$npclastgenerated]>> has laid down on his bed, looking very exhausted.'
 											'"We will have to use your bathroom," you tell him and he just waves his hand in the direction of it.' 
 											gs 'arousal', 'kiss', 3, 'lesbian'
 											gs 'arousal', 'end'
@@ -727,10 +727,10 @@ if $ARGS[0] = 'one_guy_start':
 												'On the way to the bathroom, you pick up your clothes. Then spend some minutes cleaning the rest of his cum off your faces.'
 												'You don''t talk much while you fix up your makeup and get dressed again.'
 												if rand(0,1) = 0:
-													'When you return to <<$boyname>>, he has fallen asleep, so you and Katja decide to see yourself out.'
+													'When you return to <<$npc_nickname[$npclastgenerated]>>, he has fallen asleep, so you and Katja decide to see yourself out.'
 												else
-													'When you return to <<$boyname>>, he lies still on the bed, exhausted. "Thanks for a great time. We''ll be going now," you say while Katja has grown quiet.'
-													'"OK, and it''s me who owes you for a fantastic time. Hope you can see yourself out," <<$boyname>> answers.'
+													'When you return to <<$npc_nickname[$npclastgenerated]>>, he lies still on the bed, exhausted. "Thanks for a great time. We''ll be going now," you say while Katja has grown quiet.'
+													'"OK, and it''s me who owes you for a fantastic time. Hope you can see yourself out," <<$npc_nickname[$npclastgenerated]>> answers.'
 												end
 												act 'Leave the apartement': gt 'katja_city_sex', 'going_home'
 											end

locations/katja_dorm.qsrc

@@ -1113,8 +1113,9 @@ if $ARGS[0] = 'movie_talk1':
 						locat['katja'] = 53
 						locat['katja_rand2'] = daystart
 						locat['katja_save2'] = locat['katja']						
+						katjaQW['party_location'] = 2
 						'"let''s go to the night club" you say. "Okay. I know just the dress I want to wear tonight" Katja answers, and almost before you can react she is out of her clothes and into a nice dress.'
-						act 'Prepare': gt 'katja_party', 'party_preparations.'
+						act 'Prepare': gt 'katja_party', 'party_preparations'
 					end
 				end
 			else

locations/katja_party.qsrc

@@ -231,6 +231,11 @@ end
 if $ARGS[0] = 'party_preparations':
 	menu_off = 1	
 	minut += 5
+	if katjaQW['party_location'] = 2:
+		locat['katja'] = 53
+	end
+	locat['katja_rand2'] = daystart
+	locat['katja_save2'] = locat['katja']
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/dressing_up_surprised'+iif(npc_sex['A14'] > 0 and (katjaQW['slut'] > 75 or katjaQW['pantiesQWstage'] >= 5), '1', '2')+'.jpg"></center>'
 	'"I need to finish prepping. I still need to do my makeup," Katja says as she starts moving around.'
 	'"Let me see how you look," Katja says, stopping and turning around to look at you.'
@@ -373,7 +378,7 @@ if $ARGS[0] = 'party_preparations_final':
 			'"Very nice. You will definitely be turning heads tonight."'
 			act 'Ask her to show some more' :
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/dressing_up_show_of_side_lewd.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/dressing_up_show_of_side_lewd..jpg"></center>'
 				'"You naughty girl," Katja says, but lifts up her skirt and reveals her smoothly shaven pussy. "Is this good enough for you?" she asks.'
 				'"Perfect. So you''re not wearing panties to the '+iif(locat['katja'] = 53, 'club', 'party')+' tonight?" you ask.'
 				if katjaQW['pantiesQWstage'] >=  5 or (katjaQW['slut'] >= 100 and rand(0,1) =0):
@@ -434,7 +439,7 @@ if $ARGS[0] = 'party_heading_out':
 			act 'Go to the metro': minut += 10 & gt 'katja_city',  'metro'
 		end
 	elseif katjaQW['coke_stage'] >= rand(4,7) and katjaQW['coke_day'] ! daystart: 
-		'"You know, <<pcs_nickname>>. We sometimes take some cocaine when we are partying. If you have any, then maybe we could take some now?" Katja asks, looking at you '+iif(katjaQW['coke_stage'] = 4, 'nervously.', 'with pleading eyes.')
+		'"You know, <<$pcs_nickname>>. We sometimes take some cocaine when we are partying. If you have any, then maybe we could take some now?" Katja asks, looking at you '+iif(katjaQW['coke_stage'] = 4, 'nervously.', 'with pleading eyes.')
 		if dur >= 2:
 			gs 'willpower', 'drugs', 'resist'
 			if will_cost <= pcs_willpwr:

locations/katja_procedural.qsrc

@@ -367,7 +367,7 @@ end
 
 if $ARGS[0] = 'sex_set':
 	!! Test to see if Katja have sex with somebody whiteout the player presents, and updates Katja''s stat accordingly. ARGS[1] is the number of boys Katja is with and ARGS[2] the number of girls.
-	if AGS[1] > 0:
+	if ARGS[1] > 0:
 		!! Katja was in a situation with one or more boys where she might have had sex if some of them.
 		if katjaQW['simultanous_boys'] = 0 and rand(0,4) <= katjaQW['slut']/25:
 			!! Katja have never had sex with a boy before
@@ -459,7 +459,7 @@ if $ARGS[0] = 'sex_set':
 		end
 	end
 	
-	if AGS[2] > 0:
+	if ARGS[2] > 0:
 		!! Katja was in a situation with one or more girls where she might have had sex if some of them.
 		if katjaQW['simultanous_girls'] = 0 and rand(0,3) <= katjaQW['slut']/33:
 			!! Katja have never had sex with a girl before

locations/prostitution_functions.qsrc

@@ -69,7 +69,7 @@ end
 
 if $ARGS[0] = 'prostitute_work_hours':
 	if $region = 'pushkin':
-		RESULT = (hour >= 0 and hour < 2) or (hours >= 12 and hour < 14) or (hour >= 17 and hour <= 23)
+		RESULT = (hour >= 0 and hour < 2) or (hour >= 12 and hour < 14) or (hour >= 17 and hour <= 23)
 	elseif $region = 'pav' or $MID($loc,1,4) = 'pav_':
 		RESULT = (hour >= 12 and hour < 14) or (hour >= 17 and hour <= 23)
 	else

locations/uni_dorm.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'second_floor':
 	if katjaQW['knows_dorm_room_number'] > 0 and yearstart > 1:
 		act 'Katja''s room':
 			*clr & cla 
-			if locat['katja']  = 31:
+			if locat['katja']  = 31 or locat['katja']  = 35 or locat['katja']  = 51 or locat['katja']  = 52:
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'Katja opens the door. "Hey <<$pcs_nickname>>, come on in!" She stands aside to let you enter before closing the door behind you.'