Browse Source

Merge branch 'Edited-QSP9' into Edited-TW

Stephan Fuchs 10 months ago
parent
commit
5e7979181d

+ 32 - 32
locations/Katja_nightclub.qsrc

@@ -13,7 +13,7 @@
 if $ARGS[0] = 'activity':
 	gs 'katja_meynold_schedule' 
 
-	if locat['Katja'] = 53 and (katjaQW['know_katja_uni'] = 1 or ($start_type ! 'city_tg' and $start_type ! 'uni_tg'):
+	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
@@ -134,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/nightclub/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'
@@ -142,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/nightclub/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/nightclub/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/nightclub/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
@@ -935,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/nightclub/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':
@@ -1282,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
@@ -1306,7 +1306,7 @@ if $ARGS[0] = 'private_room1':
 				*clr & cla
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/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.'
+				'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.' 
@@ -1332,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
@@ -1352,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
@@ -1367,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
@@ -1398,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:
@@ -1422,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.'
@@ -1471,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
@@ -1483,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.'
@@ -1502,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.'
@@ -1557,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
@@ -1570,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.'
@@ -1590,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.'
@@ -1609,14 +1609,14 @@ 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.'
+		'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':
@@ -1637,7 +1637,7 @@ if $ARGS[0] = 'private_room2':
 					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
@@ -1649,21 +1649,21 @@ 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 katjaQW['faithful'] = 0:
-				act 'Have sex with <<$boyname>> without Katja': 
+				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.'
+			'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') + katjaQW['horny'] > 200:

+ 21 - 21
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

+ 37 - 0
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

+ 84 - 84
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.'
+					'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.'
+			'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.'
+	'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,11 +585,11 @@ 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 katjaQW['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!"'
+	'"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
@@ -597,16 +597,16 @@ if $ARGS[0] = 'one_guy_start':
 		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 katjaQW['horny'] >= rand(70,100), 'Katja asks.', 'you ask.')
-		'<<$boyname>> immediately lies down on the bed between Katja and yourself.'
+		'<<$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,18 +655,18 @@ 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':
@@ -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

+ 2 - 1
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

+ 6 - 1
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):

+ 2 - 2
locations/pav_parkev.qsrc

@@ -514,11 +514,11 @@ if $ARGS[0] = 'walk2':
 			'As you are walking along one of the trails, you come around a bend in the trees, and a naked girl is partially covering herself up ahead of you. When she sees you, she blushes and does her best to cover herself while shrieking, then runs off into the woods before you can ask if she needs help.'
 		elseif temprand = 15:
 			gs 'exp_gain', 'prcptn', rand(1,2)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/deep/panties_ground1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/deep/panties_tree1.jpg"></center>'
 			'Walking along one of the trails opens into a small clearing just off to the side. You see something hanging from the trees, but as you get closer, it looks like significant bits of cloth. You take a couple of steps closer, wondering what it is, and then you realize it is three different pairs of panties hanging from the trees. As you quickly step back to the trail and continue your walk, you wonder exactly what happened back there. Why were the panties hung on the trees? You shake your head as you can''t fathom a reason for it.'
 		elseif temprand = 16:
 			gs 'exp_gain', 'prcptn', rand(1,2)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/deep/panties_tree1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/deep/panties_ground1.jpg"></center>'
 			 'Walking along one of the trails into a small clearing just off to the side, you see a bit of litter on the ground, but as you get closer, it looks odd. You take a few steps over, wondering what it is, before realizing that it''s a bunch of different coloured panties lying on the ground. As you quickly step back to the trail and continue your walk, you wonder exactly what happened back there. Why were so many panties just left on the ground? You shake your head as you can''t fathom a reason for it.'
 		elseif temprand = 17:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/deep/selfie_pussy1.jpg"></center>'

+ 2 - 0
locations/sex_ev_doggy.qsrc

@@ -124,6 +124,8 @@ if $ARGS[0] = 'doggy_girl_orgasm_continue':
 			'You''ve barely finished quivering when he pulls you off of him and rolls you onto your knees, pulling your hips back towards him. With one swift movement, he thrusts his cock into your still-quivering pussy. His actions earn him an involuntary gasp from your lips.'
 		end
 		'"I''m not finished yet," he growls from behind you.'
+		$sex_ev['position'] = 'doggy'
+		$sex_ev['pos_speed'] = 'doggy<<sex_ev[''speed'']>>'
 !!		act'Get fucked':gs'sex_ev_doggy', 'doggy_goto'
 		gs'sex_ev_sex', 'fuck_continue'
 	end

+ 2 - 0
locations/sex_ev_miss.qsrc

@@ -74,6 +74,8 @@ if $ARGS[0] = 'miss_girl_orgasm_continue':
 			'You''ve barely finished quivering when he pulls you off of him and pushes you onto your back, immediately plunging his cock back inside you. The sudden penetration of your still-sensitive pussy elicits involuntary whimpers of protest from you, but it doesn''t stop him for a moment, ramping into a steady rhythm.'
 		end
 		'"I''m not finished yet," he growls.'
+		$sex_ev['position'] = 'miss'
+		$sex_ev['pos_speed'] = 'miss<<sex_ev[''speed'']>>'
 !!		act'Get fucked':gs'sex_ev_miss', 'miss_goto'
 		gs'sex_ev_sex', 'fuck_continue'
 	end

+ 4 - 4
locations/sex_ev_sex.qsrc

@@ -294,12 +294,12 @@ if $ARGS[0] = 'girl_orgasm_change_position':
 	if $sex_ev['position'] = $npc_fav_pos[$boy] or rand(1,2) = 1:
 		gs 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>>_girl_orgasm_continue'
 	else
-		if rand(1,3) = 1:
+		if rand(1,2) = 1:
 			gs 'sex_ev_miss', 'miss_girl_orgasm_continue'
-		elseif rand(1,2) = 1:
-			gs 'sex_ev_doggy', 'doggy_girl_orgasm_continue'
 		else
-			gs 'sex_ev_cowgirl', 'cowgirl_girl_orgasm_continue'
+			gs 'sex_ev_doggy', 'doggy_girl_orgasm_continue'
+!!		else
+!!			gs 'sex_ev_cowgirl', 'cowgirl_girl_orgasm_continue'
 		end
 	end
 end

+ 6 - 18
locations/sportShop.qsrc

@@ -42,24 +42,12 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 
 	*pl '<center><table align="center" width=80%>'
-	if skak = 0 and money >= 500:
-		*p func ('$single_stock_item', 1, 'Skipping Rope', 500, 'skak', 'sportshop', 'start')
-	end
-	if obruch = 0 and money >= 1500:
-		*p func ('$single_stock_item', 1, 'Hula Hoop', 1500, 'obruch', 'sportshop', 'start')
-	end
-	if bookYog = 0 and money >= 1500:
-		*P func ('$single_stock_item', 1, 'Book on Yoga', 1500, 'bookyog', 'sportshop', 'start')
-	end
-	if konki = 0 and money >= 3000:
-		*p func ('$single_stock_item', 1, 'Ice Skates', 3000, 'konki', 'sportshop', 'start')
-	end
-	if pcs_ski_owned = 0 and money >= 4000:
-		*p func ('$single_stock_item', 1, 'Skis', 4000, 'pcs_ski_owned', 'sportshop', 'start')
-	end
-	if refillable_bottle = 0 and money >= 1000 and bag > 0: 
-		*p func ('$single_stock_item', 1, 'Refillable Water Bottle', 1000, 'refillable_bottle', 'sportshop', 'start')		
-	end
+	*p func ('$single_stock_item', 1, 'Skipping Rope', 500, 'skak', 'sportshop', 'start')
+	*p func ('$single_stock_item', 1, 'Hula Hoop', 1500, 'obruch', 'sportshop', 'start')
+	*P func ('$single_stock_item', 1, 'Book on Yoga', 1500, 'bookyog', 'sportshop', 'start')
+	*p func ('$single_stock_item', 1, 'Ice Skates', 3000, 'konki', 'sportshop', 'start')
+	*p func ('$single_stock_item', 1, 'Skis', 4000, 'pcs_ski_owned', 'sportshop', 'start')
+	*p func ('$single_stock_item', 1, 'Refillable Water Bottle', 1000, 'refillable_bottle', 'sportshop', 'start')		
 	*p '</table></center>'
 end
 

+ 2 - 2
locations/stat.qsrc

@@ -662,9 +662,9 @@ if minut >= 60:
 	if pcs_mood < 60 and $braworntype = 'cats': pcs_mood += 2
 
 !!Arousal adjustments
-	if ($pantyworntype = 'salacious' and $braworntype = 'salacious') and pcs_horny < 25:
+	if (PanThinness >= 5 and BraThinness >= 5) and pcs_horny < 25:
 		pcs_horny += 10
-	elseif pcs_horny < 10 and ($pantyworntype = 'salacious' or $braworntype = 'salacious'):
+	elseif pcs_horny < 10 and (PanThinness >= 5 or BraThinness >= 5):
 		pcs_horny += 5
 	end
 

+ 137 - 118
locations/stat_display.qsrc

@@ -447,27 +447,12 @@ $stat_bra_text = ''
 
 if $clothingworntype ! 'nude':
 	if PCloThinness = 6:
-		if PCloswimwear = 1:
-			$stat_bra_msg = 'Your breasts are completely visible through your transparent swimsuit.'
-			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'salacious':
-			$stat_bra_msg = 'Your breasts are clearly visible through your transparent bra and top.'
-			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
-		elseif $braworntype ! 'none':
+		if $braworntype ! 'none':
 			$stat_bra_msg = 'Your bra is clearly showing through your transparent top.'
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
-		else
-			$stat_bra_msg = 'Your breasts are fully on display through your transparent top.'
-			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		end
 	elseif PCloThinness = 5:
-		if PCloswimwear = 1:
-			$stat_bra_msg = 'The shape of your nipples is completely visible through your swimsuit.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'salacious':
-			$stat_bra_msg = 'The shape of your nipples is completely visible through your thin top and bra.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype ! 'none':
+		if $braworntype ! 'none':
 			if PCloDress = 1:
 				$stat_bra_msg = 'The shape and color of your bra is visible through your dress.'
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
@@ -475,54 +460,17 @@ if $clothingworntype ! 'nude':
 				$stat_bra_msg = 'The shape and color of your bra is visible through your top.'
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 			end
-		elseif $braworntype = 'none' and pcs_horny >= 50:
-			$stat_bra_msg = 'Your aroused nipples are hard and showing through your top.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'none' and temper < 14:
-			$stat_bra_msg = 'Your nipples are freezing cold and visibly hard through your top.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif PCloBra = 1:
-			$stat_bra_msg = 'Your top is replacing a bra.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'none':
-			if PCloDress = 1:
-				$stat_bra_msg = 'The shape of your nipples is completely visible through your thin dress.'
-				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-			else
-				$stat_bra_msg = 'The shape of your nipples is completely visible through your thin top.'
-				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-			end
 		end
 	elseif PCloThinness = 4:
-		if PCloswimwear = 1:
-			$stat_bra_msg = 'Your nipples are slightly poking through your swimsuit.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'salacious':
-			$stat_bra_msg = 'You are wearing such a thin bra that your nipples are still being faintly outlined through your top.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype ! 'none':
-			$stat_bra_msg = 'Your bra is being outlined through your top.'
-		elseif $braworntype = 'none' and pcs_horny >= 50:
-			$stat_bra_msg = 'Your aroused nipples are visibly hard.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'none' and temper < 14:
-			$stat_bra_msg = 'Your nipples are freezing cold and visibly hard through your top.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif PCloBra = 1:
-			$stat_bra_msg = 'Your top is replacing a bra.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'none':
-			if CloDress = 1:
-				$stat_bra_msg = 'The shape of your nipples is faintly visible through your dress.'
+		if $braworntype ! 'none':
+			if PCloDress = 1:
+				$stat_bra_msg = 'The outline of your bra is visible through your dress.'
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 			else
-				$stat_bra_msg = 'The shape of your nipples is faintly visible through your top.'
+				$stat_bra_msg = 'Your outline of your bra is visible through your top.'
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 			end
 		end
-	elseif PCloBra = 1:
-			$stat_bra_msg = 'Your top is replacing a bra.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 	elseif $braworntype = 'none' and pcs_horny >= 50:
 		$stat_bra_msg = 'You are not wearing a bra and your aroused nipples are rock hard.'
 		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
@@ -531,96 +479,167 @@ if $clothingworntype ! 'nude':
 		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 	elseif $braworntype = 'none':
 		if pcs_cupsize <= 5:
-			$stat_bra_msg = 'You are not wearing a bra and your flat chest feels comfortable against the inside of your clothes.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts feel comfortable against the inside of your clothes.'
 !!			$titsize = 'AA cup'
 		elseif pcs_cupsize <= 10:
-			$stat_bra_msg = 'You are not wearing a bra and your modest breasts ever so slightly bounce as you walk.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts ever so slightly bounce as you walk.'
 !!			$titsize = 'A cup'
 		elseif pcs_cupsize <= 15:
-			$stat_bra_msg = 'You are not wearing a bra and your pert breasts jiggle softly as you walk.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts jiggle softly as you walk.'
 !!			$titsize = 'B cup'
 		elseif pcs_cupsize <= 20:
-			$stat_bra_msg = 'You are not wearing a bra and your breasts bounce with every step.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts bounce with every step.'
 !!			$titsize = 'C cup'
 		elseif pcs_cupsize <= 30:
-			$stat_bra_msg = 'You are not wearing a bra and your large breasts bounce with every step.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts bounce with every step.'
 !!			$titsize = 'E cup'
 		else
-			$stat_bra_msg = 'You are not wearing a bra and your enormous breasts bounce dramatically with every step.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts bounce dramatically with every step.'
 !!			$titsize = 'K cup'
 		end
 		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 	end
+	if PCloBra = 1:
+		$stat_bra_msg = 'Your top is replacing your bra.'
+		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+	end
+	if CoverTop = 4:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are completely exposed.'
+		$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
+	elseif CoverTop = 3:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are clearly visible through your clothing.'
+		$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
+	elseif CoverTop = 3:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are visible through your clothing.'
+		$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
+	elseif CoverTop = 3:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are barely visible through your clothing.'
+		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+	end
 end
 
 $stat_panty_msg = ''
 $stat_panty_text = ''
 
-if $pantyworntype = 'none' and PCloswimwear = 0 and PCloPanties = 0:
-	if PCloStyle = 4:
-		$stat_panty_msg = 'You are not wearing panties, but you are dressed as a hooker, so that''s hardly surprising.'
-		$stat_panty_text = '<BR><font color= #FF00FF><<$stat_panty_msg>></font>'
-	elseif PCloBimbo = 1 or bimbolevel > 0 and PCloSkirt > 3 and cheatBimbo = 0:
-		$stat_panty_msg = 'You like, totally forgot to put on any panties. You are such a bimbo.'
-		$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and pcs_traits['commando_lvl'] > 0:
-		$stat_panty_msg = 'You feel liberated not wearing panties as your naked ass flashes from under your short skirt.'
-		$stat_panty_text = '<BR><font color=#0064FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and pcs_traits['commando_lvl'] < 1:
-		if pcs_inhib <= 50:
-			$stat_panty_msg = 'Your face is flushed with shame. You are not wearing panties, and your naked ass flashes from under your short skirt.'
-		else
-			$stat_panty_msg = 'It feels odd and a bit uncomfortable not wearing panties with such a short skirt. Your naked ass flashes from under it.'
+if $clothingworntype ! 'nude':
+	if PCloThinness = 6:
+		if $pantyworntype ! 'none':
+			if PCloDress = 1:
+				$stat_panty_msg = 'Your panties are clearly showing through your transparent dress.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			elseif PCloSkirt > 0:
+				$stat_panty_msg = 'Your panties are clearly showing through your transparent skirt.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			else
+				$stat_panty_msg = 'Your panties are clearly showing through your transparent pants.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			end
+		end
+	elseif PCloThinness = 5:
+		if $pantyworntype ! 'none':
+			if PCloDress = 1:
+				$stat_panty_msg = 'The shape and color of your panties are visible through your dress.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			elseif PCloSkirt > 0:
+				$stat_panty_msg = 'The shape and color of your panties are visible through your skirt.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			else
+				$stat_panty_msg = 'The shape and color of your panties are visible through your pants.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			end
+		end
+	elseif PCloThinness = 4:
+		elseif $pantyworntype ! 'none':
+			if PCloDress = 1:
+				$stat_panty_msg = 'The outline of your panties is visible through your dress.'
+				$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+			elseif PCloSkirt > 0:
+				$stat_panty_msg = 'The outline of your panties is visible through your skirt.'
+				$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+			else
+				$stat_panty_msg = 'The outline of your panties is visible through your pants.'
+				$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+			end
 		end
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 2:
-		$stat_panty_msg = 'You are comfortably commando, not bothered at all by your bare pussy rubbing against the inside of your pants.'
-	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 3:
-		$stat_panty_msg = 'You are happily commando, feeling very comfortable with your ass and pussy touching the inside of your pants.'
-	elseif PCloPants > 0 and $braworntype = 'none':
-		$stat_panty_msg = 'You aren''t wearing underwear, and your bare pussy is rubbing against your clothing.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and $braworntype ! 'none':
-		$stat_panty_msg = 'You aren''t wearing panties, and your bare pussy is rubbing against your clothing.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif towel = 1:
-		$stat_panty_msg = 'Your naked body is covered only by a short towel.'
+	elseif $pantyworntype = 'none':
+		$stat_panty_msg = 'You are not wearing a panties.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
-	elseif $clothingworntype ! 'nude' and pcs_traits['commando_lvl'] < 1:
-		$stat_panty_msg = 'You are not wearing panties and it makes you uncomfortable.'
+	end
+
+	if PCloPants = 1:
+		$stat_panty_msg = 'Your outfit is replacing your panties.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
-	elseif $clothingworntype ! 'nude':
-		$stat_panty_msg = 'You are not wearing panties.'
-	end
-elseif $pantyworntype = 'salacious' and PCloswimwear = 0:
-	if PCloStyle = 4:
-		$stat_panty_msg = 'You are wearing see-through panties, but you are dressed as a hooker, so that''s hardly surprising.'
-		$stat_panty_text = '<BR><font color= #FF00FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and pcs_inhib > 50:
-		$stat_panty_msg = 'Your ass is clearly visible through your panties, is flashing from under your short skirt.'
-		$stat_panty_text = '<BR><font color=#0064FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and pcs_inhib <= 50:
-		$stat_panty_msg = 'Your face is flushed with shame. You are wearing panties so thin they leave your ass clearly visible as it flashes from under your short skirt.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 3:
-		$stat_panty_msg = 'You wearing transparent panties, but that you''re wearing any at all is bringing down your mood.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	end
-elseif $pantyworntype ! 'none' and pcs_traits['commando_lvl'] = 3:
-	$stat_panty_msg = 'You wearing panties and it makes you uncomfortable.'
-	$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
+	end
+
+	if CoverBack = 4:
+		if CoverFront = 4:
+			$stat_panty_msg = 'Your pussy and butt are completely exposed.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 3:
+			$stat_panty_msg = 'Your pussy is clearly visible and your butt completely exposed through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 2:
+			$stat_panty_msg = 'Your pussy is visible and your butt completely exposed through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 1:
+			$stat_panty_msg = 'Your pussy is barely visible and your butt completely exposed through your clothing.'
+			$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+		end
+	elseif CoverBack = 3:
+		if CoverFront = 4:
+			$stat_panty_msg = 'Your butt is clearly visible and your pussy completely exposed.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 3:
+			$stat_panty_msg = 'Your pussy and your butt are clearly visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 2:
+			$stat_panty_msg = 'Your pussy is visible and your butt clearly visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 1:
+			$stat_panty_msg = 'Your pussy is barely visible and your butt clearly visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+		end
+	elseif CoverBack = 2:
+		if CoverFront = 4:
+			$stat_panty_msg = 'Your butt is visible and your pussy completely exposed.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 3:
+			$stat_panty_msg = 'Your pussy is clearly visible and your butt visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 2:
+			$stat_panty_msg = 'Your pussy and butt are visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 1:
+			$stat_panty_msg = 'Your pussy is barely visible and your butt visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+		end
+	elseif CoverBack = 1:
+		if CoverFront = 4:
+			$stat_panty_msg = 'Your butt is barely visible and your pussy completely exposed.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 3:
+			$stat_panty_msg = 'Your pussy is clearly visible and your butt barely visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 2:
+			$stat_panty_msg = 'Your pussy is visible and your butt barely visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 1:
+			$stat_panty_msg = 'Your pussy and your butt are barely visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+		end
+	end
 end
 
 $stat_clothes_msg = ''
 $stat_clothes_text = ''
 
 if $clothingworntype = 'nude':
-	if $pantyworntype = 'salacious':
-		if $braworntype = 'none':
+	if PanThinness >= 5:
+		if BraThinness >= 5:
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through panties, and your boobs sway invitingly as you walk.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through panties.'
 			$stat_clothes_msg = 'You are only wearing your see-through panties, and your boobs sway invitingly as you walk.'
-		elseif $braworntype = 'salacious':
+		elseif BraThinness >= 5:
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through underwear.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through underwear.'
 			$stat_clothes_msg = 'You are only wearing your see-through underwear.'
@@ -634,7 +653,7 @@ if $clothingworntype = 'nude':
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your panties, and your boobs sway invitingly as you walk.</font>'
 			$stat_clothes_tooltip = 'You are wearing your panties.'
 			$stat_clothes_msg = 'You are only wearing your panties, and your boobs sway invitingly as you walk.'
-		elseif $braworntype = 'salacious':
+		elseif BraThinness >= 5:
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through bra and panties.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through bra and panties.'
 			$stat_clothes_msg = 'You are only wearing your see-through bra and panties.'

+ 32 - 32
sugarcube/src/autogenerated/unsorted/Katja_nightclub.tw

@@ -12,7 +12,7 @@
 <!-- !! katjaQW['disco_loc'] = 8: Katja is in the restroom-->
 <<if $location_var[$here][0] == 'activity'>>
 	<<gs 'katja_meynold_schedule'>>
-	<<if getvar("$locat['Katja']") == 53 and (katjaQW['know_katja_uni'] == 1 or ($start_type != 'city_tg' and $start_type != 'uni_tg')>>
+	<<if getvar("$locat['Katja']") == 53 and (getvar("$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>>
 			<<setinit $katjaQW['disco_loc'] = 0>>
@@ -134,7 +134,7 @@
 		<<setinit $katjaQW['disco_met'] = $totminut>>
 		<<gs 'npc_relationship' 'modify' 'A14' 'like'>>
 		<<if getvar("$katjaQW['QWstage']") > 0 or $npcs.get('A14','rel') > 70>>
-			<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on_dance_floor.jpg">>
+			<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg">>
 			<p>You approach her from behind. "Hi, Katja!" you shout, so she can hear you.</p>
 			<p>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!"</p>
 			<<actCLA 'Dance with Katja'>>
@@ -144,7 +144,7 @@
 			<<image "characters/shared/headshots_main/big14.jpg">>
 			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>>
-			<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on_dance_floor.jpg">>
+			<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg">>
 			<p>You approach her from behind. "Hi, Katja!" you shout, so she can hear you.</p>
 			<p>She turns around and when she sees it is you, she shouts back, "Hi, $pc.name_nick! You decided to come clubbing tonight as well? It's a great place to let loose. Why don't we dance?"</p>
 			<<actCLA 'Dance with Katja'>>
@@ -153,7 +153,7 @@
 		<</if>>
 	<<else>>
 		<<if getvar("$katjaQW['QWstage']") > 0 or $npcs.get('A14','rel') > 70>>
-			<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on_dance_floor.jpg">>
+			<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg">>
 			<p>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!"</p>
 			<<actCLA 'Dance with Katja'>>
 				<<gt 'katja_nightclub' 'dance'>>
@@ -162,7 +162,7 @@
 			<<image "characters/shared/headshots_main/big14.jpg">>
 			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>>
-			<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on_dance_floor.jpg">>
+			<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg">>
 			<p>You approach her and when she sees you coming, she shouts, "Hi, $pc.name_nick! So you're back. Let's dance!"</p>
 			<<actCLA 'Dance with katja'>>
 				<<gt 'katja_nightclub' 'dance'>>
@@ -988,7 +988,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'dance_guy1'>>
-	<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing2.jpg">>
+	<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing1.jpg">>
 	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.
 	<<actCLA 'Let him join you'>>
 		<<gt 'katja_nightclub' 'dance_guy2'>>
@@ -1327,14 +1327,14 @@
 	<<gs 'beverage' 'only_stat_bev_cocktail'>>
 	<<setinit $katjaQW['drinks'] += rand(1,2)>>
 	<center><<image `'images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy'+rand(1,2)+'.jpg'`>></center>
-	<p>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.</p>
+	<p>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 <<=$npcs.get($npclastgenerated,'nickname')>> and asks for your names.</p>
 	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 getvar("$katjaQW['coke_stage']") == -1>>
-			<p>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.</p>
+			<p>After a few minutes, <<=$npcs.get($npclastgenerated,'nickname')>> says, "Why don't we try some other good stuff?" He pulls out a small bag with white powder inside.</p>
 			"That''s it. I'm out of here," Katja says and gets up and leaves abruptly.
-			<p>$boyname looks confused. "What was that about?" he asks.</p>
-			<p>"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.</p>
+			<p><<=$npcs.get($npclastgenerated,'nickname')>> looks confused. "What was that about?" he asks.</p>
+			<p>"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 <<=$npcs.get($npclastgenerated,'nickname')>>.</p>
 			<<actCLA 'Find Katja'>>
 				<<set $time.minutes += 10>>
 				<<image "characters/shared/headshots_main/big14.jpg">>
@@ -1348,7 +1348,7 @@
 			<<actCLA 'Enjoy your drinks'>>
 				<<set $time.minutes += 5>>
 				<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/disco_guy_coke.jpg">>
-				<p>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.</p>
+				<p>After a few minutes, <<=$npcs.get($npclastgenerated,'nickname')>> says, "Why don't we try some other good stuff?" He pulls out a small bag with white powder inside.</p>
 				<<if getvar("$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.
 					<p>"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.</p>
@@ -1368,7 +1368,7 @@
 						<<gs 'drugs' 'cocaine'>>
 						<<image "characters/shared/drugs/cocaine.jpg">>
 						You take the tube and snort the first line and then the second, while Katja looks at you with wide open eyes.
-						<p>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."</p>
+						<p>After a short moment, it hits you and you feel the full effect of the drug. <<=$npcs.get($npclastgenerated,'nickname')>> 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."</p>
 						<<if func('katja_procedural', 'willing_to_be_naughty') < 85>>
 							<<gs 'willpower' 'drugs' 'force' 'hard'>>
 						<<else>>
@@ -1385,7 +1385,7 @@
 								"You won''t know unless you try it. See, we are both fine," you continue.
 								<p>"I'm still not sure. Why should I do it?" she asks.</p>
 								"Because it feels great. You can't say it's not for you until you actually know how it feels," you say.
-								<p>"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.</p>
+								<p>"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 <<=$npcs.get($npclastgenerated,'nickname')>> prepared for her.</p>
 								<p>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.</p>
 								<p>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.</p>
 								<p>After a moment, her discomfort resides and she starts to talk. "I don't feel anything, except itching in my nose. I do-" Then it hits her, she stops mid-sentence and her eyes become wide open. "Wow!" is all she can say.</p>
@@ -1400,7 +1400,7 @@
 						<</if>>
 						<<actCLA 'Don`t push Katja'>>
 							<<set $time.minutes += 2>>
-							<p>"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.</p>
+							<p>"It's fine if you don't want to, Katja," you say. She seems relieved. <<=$npcs.get($npclastgenerated,'nickname')>> doesn't say anything and just cleans up the drugs.</p>
 							<<actCLA 'Continue talking'>>
 								<<gt 'katja_nightclub' 'private_room2' 2>>
 							<</actCLA>>
@@ -1427,7 +1427,7 @@
 						<<gs 'drugs' 'cocaine'>>
 						<<image "characters/shared/drugs/cocaine.jpg">>
 						"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.
-						<p>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.</p>
+						<p>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. <<=$npcs.get($npclastgenerated,'nickname')>> takes the tube and cleans up the drugs.</p>
 						<<actCLA 'Continue talking'>>
 							<<gt 'katja_nightclub' 'private_room2' 2>>
 						<</actCLA>>
@@ -1450,13 +1450,13 @@
 							<<gs 'drugs' 'cocaine'>>
 							<<gs 'katja_procedural' 'take_cocaine'>>
 							<<image "characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg">>
-							<p>"Come on, Katja. Let's do it together," you say as you take the tube from $boyname.</p>
+							<p>"Come on, Katja. Let's do it together," you say as you take the tube from <<=$npcs.get($npclastgenerated,'nickname')>>.</p>
 							<p>She still looks skeptical. "I don't know, $pc.name_nick. I'm not sure it's a good idea," she replies.</p>
 							<p>"You liked it last time! it will be fine this time, too," you continue.</p>
 							<<set '"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.
-							<p>$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.</p>
+							<p><<=$npcs.get($npclastgenerated,'nickname')>> has already produced another tube and hands it to Katja, who takes it with unsteady hands. You both lover your heads to the table.</p>
 							<<set '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.')>>
 							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.
 							<<actCLA 'Continue talking'>>
@@ -1493,7 +1493,7 @@
 									<<set 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.
 									<<set '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.')>>
-									<p>"Well, more for me then," $boyname says and does a few more lines before packing away the drugs.</p>
+									<p>"Well, more for me then," <<=$npcs.get($npclastgenerated,'nickname')>> says and does a few more lines before packing away the drugs.</p>
 									<<actCLA 'Continue talking'>>
 										<<gt 'katja_nightclub' 'private_room2' 1>>
 									<</actCLA>>
@@ -1505,7 +1505,7 @@
 								<<set $time.minutes += 5>>
 								<<gs 'katja_procedural' 'take_cocaine'>>
 								<<image "pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg">>
-								<p>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.</p>
+								<p>You watch as Katja takes the tube, puts one end at her nose and bows down to the start of the line that <<=$npcs.get($npclastgenerated,'nickname')>> has prepared for her.</p>
 								She then sniffs the line with no problem and just sits up waiting for the the drugs to hit her.
 								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.
 								<<actCLA 'Continue talking'>>
@@ -1520,8 +1520,8 @@
 						<<gs 'drugs' 'cocaine'>>
 						<<gs 'katja_procedural' 'take_cocaine'>>
 						<<image "characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg">>
-						<p>"Come on, Katja. Let's do it together," you say as you take the tube from $boyname.</p>
-						<p>She agrees and $boyname hands her another tube and Katja takes it happily.</p>
+						<p>"Come on, Katja. Let's do it together," you say as you take the tube from <<=$npcs.get($npclastgenerated,'nickname')>>.</p>
+						<p>She agrees and <<=$npcs.get($npclastgenerated,'nickname')>> hands her another tube and Katja takes it happily.</p>
 						You put your tubes to your nostrils and lover your heads to the table and sniff your line. Katja does it with great enthusiasm.
 						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.
 						<<actCLA 'Continue talking'>>
@@ -1570,7 +1570,7 @@
 										<p>"You aren't my mom!" Katja says.</p>
 										"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.
-										<p>"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.</p>
+										<p>"Well, more for me then," <<=$npcs.get($npclastgenerated,'nickname')>> says and does a few more lines before packing away the drugs. Katja looks longingly at the drugs while he is doing so.</p>
 										<<actCLA 'Continue talking'>>
 											<<gt 'katja_nightclub' 'private_room2' 1>>
 										<</actCLA>>
@@ -1583,7 +1583,7 @@
 								<<set $time.minutes += 5>>
 								<<gs 'katja_procedural' 'take_cocaine'>>
 								<<image "pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg">>
-								<p>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.</p>
+								<p>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 <<=$npcs.get($npclastgenerated,'nickname')>> has prepared for her.</p>
 								She then sniffs the line like a pro and sits up, waiting for the the drugs to hit her.
 								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.
 								<<actCLA 'Continue talking'>>
@@ -1599,7 +1599,7 @@
 						<<gs 'katja_procedural' 'take_cocaine'>>
 						<<image "characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg">>
 						"Okay, Katja. Let''s do it together," you say.
-						<p>"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.</p>
+						<p>"Yes. That's the spirit," she replies as she has already taken the tube from <<=$npcs.get($npclastgenerated,'nickname')>>. He quickly produces another one and hands it to you.</p>
 						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.
 						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.
 						<<actCLA 'Continue talking'>>
@@ -1619,7 +1619,7 @@
 	<<set $time.minutes += 7>>
 	<center><<image `'images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy'+rand(1,2)+'.jpg'`>></center>
 	<<if $pc.hotcat + $location_var[$here][1] < rand(6,14)>>
-		<p>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.</p>
+		<p>You sit and talk for a while, and after your drinks are finished, <<=$npcs.get($npclastgenerated,'nickname')>> 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.</p>
 		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.
 		<<actCLA 'Go to the dance floor'>>
@@ -1627,7 +1627,7 @@
 		<</actCLA>>
 	<<else>>
 		<<arouse 'foreplay' 3 >>
-		<p>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.</p>
+		<p>You sit and talk while you sip your drinks. During this time, <<=$npcs.get($npclastgenerated,'nickname')>>'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.</p>
 		<<if (getvar("$katjaQW['QWstage']") <= 6 and getvar("$katjaQW['liberated']") == 0) or (getvar("$katjaQW['simultanous_boys']") == 0 and getvar("$katjaQW['liberated']") == 1) or getvar("$katjaQW['boy_block']") == 1 or getvar("$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.
 			<<actCLA 'Make it clear that you`re also not interested'>>
@@ -1648,7 +1648,7 @@
 					<<gs 'willpower' 'sex' 'force'>>
 				<</if>>
 				<<if $will_cost <= $pc.pcs_willpwr>>
-					<<actCLA 'Convince Katja to have sex with $boyname (will_cost Willpower)'>>
+					<<actCLA 'Convince Katja to have sex with $npcs.get('+$npclastgenerated,'nickname')+' (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'force'>>
 						<<arouse 'foreplay_give' 3 >>
 						<<setinit $KatjaQW['horny'] += 20>>
@@ -1660,22 +1660,22 @@
 						<</actCLA>>
 					<</actCLA>>
 				<<else>>
-					<<actCLA `'Convince Katja to have sex with <<$boyname>> ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
+					<<actCLA `'Convince Katja to have sex with <<$npcs.get($npclastgenerated,'nickname')>> ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 				<</if>>
 			<</if>>
 			<<if getvar("$katjaQW['faithful']") == 0>>
-				<<actCLA 'Have sex with $boyname without Katja'>>
+				<<actCLA 'Have sex with $npcs.get('+$npclastgenerated,'nickname')+' 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.
-					<p>"What are you doing, $pc.name_nick?" Katja asks while getting flustered. YOu just ignore her and continue to stroke $boyname's now hard cock through his pants.</p>
+					<p>"What are you doing, $pc.name_nick?" Katja asks while getting flustered. YOu just ignore her and continue to stroke <<=$npcs.get($npclastgenerated,'nickname')>>'s now hard cock through his pants.</p>
 					<p>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.</p>
-					<<actCLA 'Have sex with $boyname'>>
+					<<actCLA 'Have sex with $npcs.get('+$npclastgenerated,'nickname')+''>>
 						<<set $picrand = 38>> <<set $sexloc = 'city_nightclub'>> <<xgt 'sex' 'var'>>
 					<</actCLA>>
 				<</actCLA>>
 			<</if>>
 		<<else>>
 			<<arouse 'erotic' -3 >>
-			<p>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.</p>
+			<p>Katja is visibly enjoying his attention and reciprocates by starting to stroke his thigh, moving closer and closer to his crutch. <<=$npcs.get($npclastgenerated,'nickname')>> seems completely captivated by her and forgets about you. Moving his hand from your thigh to Katja's breasts.</p>
 			<p>"You gotta feel this, $pc.name_nick," 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.</p>
 			<<actCLA 'Join Katja and have a threesome'>>
 				<<gt 'katja_nightclub_sex' 'private_booth_FFM'>>

+ 21 - 21
sugarcube/src/autogenerated/unsorted/Katja_nightclub_sex.tw

@@ -14,7 +14,7 @@
 	<<arouse 'foreplay_give' 3 `['group','lesbian']`>>
 	<<setinit $KatjaQW['horny'] += rand(10,20)>>
 	<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private1.jpg">>
-	<<set '"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.'>>
+	<<set '"Why don't the two of you get started?" $npcs.get($npclastgenerated,'nickname') 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 getvar("$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 getvar("$katjaQW['simultanous_girls']") > 1>>
@@ -28,10 +28,10 @@
 		<p>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.</p>
 	<</if>>
 	<<set 'You are ' + iif($wardrobe.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.'>>
-	<p>So you just go for it and start sucking on her left tit. She starts moaning loudly and $boyname looks on intently.</p>
+	<p>So you just go for it and start sucking on her left tit. She starts moaning loudly and <<=$npcs.get($npclastgenerated,'nickname')>> looks on intently.</p>
 	<<actCLA 'Start licking her pussy'>>
 		<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private2.jpg">>
-		<p>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.</p>
+		<p>You gently lay Katja down and start licking her now very wet pussy. She moans and <<=$npcs.get($npclastgenerated,'nickname')>> can't hold back anymore and starts sucking on her luscious breast.</p>
 		<<arouse 'cuni_give' 3 `['group','lesbian']`>>
 		<<setinit $KatjaQW['horny'] += rand(10,20)>>
 		<<actCLA '69'>>
@@ -51,33 +51,33 @@
 					<<setinit $katjaQW['first_time_in_nightclub'] = 2>>
 					<<gs 'npc_relationship' 'modify' 'A14' 'adore'>>
 				<</if>>
-				<p>Your licking is pretty good and soon Katja has a powerful, explosive orgasm. $boyname watches in amazement.</p>
+				<p>Your licking is pretty good and soon Katja has a powerful, explosive orgasm. <<=$npcs.get($npclastgenerated,'nickname')>> watches in amazement.</p>
 			<<else>>
-				<p>While you lick each other, $boyname looks on, getting more and more aroused.</p>
+				<p>While you lick each other, <<=$npcs.get($npclastgenerated,'nickname')>> looks on, getting more and more aroused.</p>
 			<</if>>
 			<<arouse 'cuni_give' 3 `['group','lesbian']`>>
 			<<arouse 'cuni' -3 `['group','lesbian']`>>
-			<<actCLA 'Suck $boyname`s cock'>>
+			<<actCLA 'Suck $npcs.get('+$npclastgenerated,'nickname')+''s cock'>>
 				<<setinit $KatjaQW['horny'] += rand(5,10)>>
 				<<if $npcs.get('A14','throat') < $dick>>
 					<<run $npcs.inc('A14','throat',1)>>
 
 				<</if>>
 				<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private4.jpg">>
-				<p>"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.</p>
-				<p>"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.</p>
+				<p>"Why don't you join us, <<=$npcs.get($npclastgenerated,'nickname')>>?" you ask. He quickly gets up and you help him undress, revealing his dick cm $dick_girth cock.</p>
+				<p>"Let's give this nice cock a good licking, Katja," you say. The two of you get on your knees and share <<=$npcs.get($npclastgenerated,'nickname')>>'s dick.</p>
 				<<arouse 'bj' 3 `['group']`>>
 				<<actCLA 'Get to fucking'>>
 					<<setinit $KatjaQW['horny'] += rand(5,10)>>
 					<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private5.jpg">>
-					<p>"I think my cock deserves some pussy now," $boyname says after you've sucked his cock for a few minutes.</p>
+					<p>"I think my cock deserves some pussy now," <<=$npcs.get($npclastgenerated,'nickname')>> says after you've sucked his cock for a few minutes.</p>
 					You lie down on the table, and he gets right to jamming his very hard cock into your pussy and starts thrusting.
-					<p>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.</p>
+					<p>Katja looks on for a moment, then she moves her mouth to your pussy and starts to lick your clit while <<=$npcs.get($npclastgenerated,'nickname')>>'s cock goes in and out of your slit.</p>
 					<<arouse 'vaginal' 3 `['group']`>>
 					<<arouse 'cuni' -2 `['group','lesbian']`>>
 					<<actCLA 'Katja`s turn'>>
 						<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private6.jpg">>
-						<p>"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.</p>
+						<p>"Now, it's time to try the redhead's pussy," <<=$npcs.get($npclastgenerated,'nickname')>> 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.</p>
 						<<if $npcs.get('A14','vag') < $dick>>
 							<<setinit $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,10 +92,10 @@
 
 						-->
 						<<warn "CONVERSION ERROR 6547611e491283a9dbfa35d66f1906a9">>
-						<p>$boyname then grabs your head and starts to make out with you while he fucks Katja, who is still licking your pussy.</p>
+						<p><<=$npcs.get($npclastgenerated,'nickname')>> then grabs your head and starts to make out with you while he fucks Katja, who is still licking your pussy.</p>
 						<<arouse 'kiss' -2 `['group']`>>
 						<<arouse 'cuni' 3 `['group','lesbian']`>>
-						<<actCLA 'Get on top of $boyname'>>
+						<<actCLA 'Get on top of $npcs.get('+$npclastgenerated,'nickname')+''>>
 							<<setinit $KatjaQW['horny'] += rand(5,15)>>
 							<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private7.jpg">>
 							After hammering Katja for a few minutes, he pulls out, gives a pat on her butt cheek and says, "Get off the couch. It's time for you to do the work."
@@ -113,20 +113,20 @@
 								<<actCLA 'Katja`s turn again'>>
 									<<setinit $KatjaQW['horny'] += rand(5,15)>>
 									<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private9.jpg">>
-									<p>"Get up on all fours and show me those booties," $boyname says as he stands up.</p>
-									<p>Following his commands, you crawl up on the couch and stick out your butts. $boyname starts playing with both of your pussies.</p>
+									<p>"Get up on all fours and show me those booties," <<=$npcs.get($npclastgenerated,'nickname')>> says as he stands up.</p>
+									<p>Following his commands, you crawl up on the couch and stick out your butts. <<=$npcs.get($npclastgenerated,'nickname')>> starts playing with both of your pussies.</p>
 									'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.')
 									<<arouse 'cuni' 3 `['group']`>>
 									<<actCLA 'Switch one more time'>>
 										<<setinit $KatjaQW['horny'] += rand(0,10)>>
 										<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private10.jpg">>
-										<p>$boyname then switches from Katja to you and stuffs his $dick_girth cock into your '+iif(pcs_vag < dick, 'tight ',')+'pussy.</p>
+										<p><<=$npcs.get($npclastgenerated,'nickname')>> then switches from Katja to you and stuffs his $dick_girth cock into your '+iif(pcs_vag < dick, 'tight ',')+'pussy.</p>
 										He starts to pound you and Katja gets up close to see how his dick glides in and out of your pussy.
 										<<arouse 'vaginal' 3 `['group']`>>
 										<<actCLA 'Katja wants more'>>
 											<<setinit $KatjaQW['horny'] += rand(10,20)>>
 											<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private11.jpg">>
-											<p>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.</p>
+											<p>Katja seems very eager to get some more cock, so much that she crawls up on your back to present her ass to <<=$npcs.get($npclastgenerated,'nickname')>>. He promptly removes his cock from your pussy and shoves it back in hers.</p>
 											<<if getvar("$KatjaQW['horny']") >= 100>>
 												<<setinit $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.
@@ -137,13 +137,13 @@
 											<<actCLA 'One last fuck'>>
 												<<setinit $KatjaQW['horny'] += rand(0,10)>>
 												<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private12.jpg">>
-												<p>$boyname pulls out of Katja and shouts "You! On your back. I'm going to fuck you one more time before I come."</p>
+												<p><<=$npcs.get($npclastgenerated,'nickname')>> pulls out of Katja and shouts "You! On your back. I'm going to fuck you one more time before I come."</p>
 												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.
 												<<arouse 'vaginal' 3 `['group']`>>
 												<<arouse 'foreplay' -3 `['group','lesbian']`>>
 												<<actCLA 'He`s cumming'>>
 													<<image "characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private13.jpg">>
-													<p>$boyname suddenly pulls out and cums all over your butts while Katja and you are flicking your tongues together.</p>
+													<p><<=$npcs.get($npclastgenerated,'nickname')>> suddenly pulls out and cums all over your butts while Katja and you are flicking your tongues together.</p>
 													"That was great" he says and slumps back into the couch. "What a wonderful fuck. You ladies are fantastic," he continuous,
 													<!-- FAILED TO CONVERT
 														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.')
@@ -152,8 +152,8 @@
 
 													-->
 													<<warn "CONVERSION ERROR 987c918c11d67f916755ccad0f1a0c2b">>
-													<p>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.</p>
-													<p>"I feel energized," Katja says. "Let's go dance. Bye, $boyname!" she continues, and she practically drags you to the dance floor.</p>
+													<p>She finds some napkins in her purse and hands them to you to clean off the cum. You then get dressed while <<=$npcs.get($npclastgenerated,'nickname')>> keeps sitting on the couch.</p>
+													<p>"I feel energized," Katja says. "Let's go dance. Bye, <<=$npcs.get($npclastgenerated,'nickname')>>!" she continues, and she practically drags you to the dance floor.</p>
 													<<arouse 'kiss' 3 `['lesbian']`>>
 													<<arousalEnd>>
 													<<gs 'cum_call' 'stomach' $boy 1>>

+ 84 - 84
sugarcube/src/autogenerated/unsorted/katja_city_sex.tw

@@ -11,15 +11,15 @@
 	<<gs 'drugs' 'alcohol' 'wine' 1>>
 	<<set $location_type = 'indoors'>>
 	<<image "characters/pavlovsk/school/girl/katja/uni/city/drinking_wine.jpg">>
-	<p>While you walk through the streets, the guy introduces himself as $boyname, before you and Katja tell him your names.</p>
+	<p>While you walk through the streets, the guy introduces himself as <<=$npcs.get($npclastgenerated,'nickname')>>, before you and Katja tell him your names.</p>
 	It doesn''t take long before you arrive at his building and he shows you up to his rather nice apartment.
 	<p>"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.</p>
 	<<if getvar("$katjaQW['QWstage']") == 5>>
-		<p>Soon, you are relaxing and having some wine. $boyname's free hand gently caresses both your and Katja's thighs from time to time.</p>
+		<p>Soon, you are relaxing and having some wine. <<=$npcs.get($npclastgenerated,'nickname')>>'s free hand gently caresses both your and Katja's thighs from time to time.</p>
 		<p>It's clear that Katja is nervous; each time he touches her, she jumps slightly, but she doesn't try to stop him.</p>
 		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.
-		<<actCLA 'Make out with $boyname'>>
+		<<actCLA 'Make out with $npcs.get('+$npclastgenerated,'nickname')+''>>
 			<<gt 'katja_city_sex' 'first_time'>>
 		<</actCLA>>
 	<<else>>
@@ -31,11 +31,11 @@
 					<<setinit $katjaQW['horny'] -= 20>>
 					<<image "characters/shared/headshots_main/big14.jpg">>
 					"No. I don't want any of that. And if you use it, I'm out of here," Katja says very harshly.
-					<p>"OK, OK. I'll put it away," $boyname says and leaves the room to hide his drugs.</p>
-					<p>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.</p>
+					<p>"OK, OK. I'll put it away," <<=$npcs.get($npclastgenerated,'nickname')>> says and leaves the room to hide his drugs.</p>
+					<p>Katja has relaxed by the time he comes back, and you start to enjoy sipping your wine and making small talk. <<=$npcs.get($npclastgenerated,'nickname')>>'s free hand gently caresses your and Katja's thighs from time to time. Katja returns his touch and you do the same.</p>
 					<<if func('katja_procedural', 'willing_to_be_naughty') > 80 and $katjaQW['horny'] >= rand(70,100)>>
 						<p>After a short while of this, Katja asks, "Why don't you show us your bedroom?"</p>
-						<p>$boyname quickly gets up. "Right this way."</p>
+						<p><<=$npcs.get($npclastgenerated,'nickname')>> quickly gets up. "Right this way."</p>
 						<<actCLA 'Go to his bedroom'>>
 							<<gt 'katja_city_sex' 'one_guy_start'>>
 						<</actCLA>>
@@ -70,7 +70,7 @@
 							<<gs 'drugs' 'cocaine'>>
 							<<image "characters/shared/drugs/cocaine.jpg">>
 							You take the tube and snort the first line and then the second, while Katja looks at you with wide open eyes.
-							<p>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."</p>
+							<p>After a short moment, it hits you and you feel the full effect of the drug. <<=$npcs.get($npclastgenerated,'nickname')>> 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."</p>
 							<<if func('katja_procedural', 'willing_to_be_naughty') < 85>>
 								<<gs 'willpower' 'drugs' 'force' 'hard'>>
 							<<else>>
@@ -87,7 +87,7 @@
 									"You won''t know unless you try it. See, we are both fine," you continue.
 									<p>"I'm still not sure. Why should I do it?" she asks.</p>
 									"Because it feels great. You can't say it's not for you until you actually know how it feels," you say.
-									<p>"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.</p>
+									<p>"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 <<=$npcs.get($npclastgenerated,'nickname')>> prepared for her.</p>
 									<p>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.</p>
 									<p>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.</p>
 									<p>After a moment, her discomfort resides and she starts to talk. "I don't feel anything, except itching in my nose. I do-" Then it hits her, she stops mid-sentence and her eyes become wide open. "Wow!" is all she can say.</p>
@@ -102,7 +102,7 @@
 							<</if>>
 							<<actCLA 'Don`t push Katja'>>
 								<<set $time.minutes += 2>>
-								<p>"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.</p>
+								<p>"It's fine if you don't want to, Katja," you say. She seems relieved. <<=$npcs.get($npclastgenerated,'nickname')>> doesn't say anything and just cleans up the drugs.</p>
 								<<actCLA 'Continue talking'>>
 									<<gt 'katja_city_sex' 'after_drugs'>>
 								<</actCLA>>
@@ -128,7 +128,7 @@
 							<<gs 'drugs' 'cocaine'>>
 							<<image "characters/shared/drugs/cocaine.jpg">>
 							"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.
-							<p>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.</p>
+							<p>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. <<=$npcs.get($npclastgenerated,'nickname')>> takes the tube and cleans up the drugs.</p>
 							<<actCLA 'Continue talking'>>
 								<<gt 'katja_city_sex' 'after_drugs'>>
 							<</actCLA>>
@@ -150,13 +150,13 @@
 								<<gs 'drugs' 'cocaine'>>
 								<<gs 'katja_procedural' 'take_cocaine'>>
 								<<image "pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg">>
-								<p>"Come on, Katja. Let's do it together," you say as you take the tube from $boyname.</p>
+								<p>"Come on, Katja. Let's do it together," you say as you take the tube from <<=$npcs.get($npclastgenerated,'nickname')>>.</p>
 								<p>She still looks skeptical. "I don't know, $pc.name_nick. I'm not sure it's a good idea," she replies.</p>
 								<p>"You liked it last time! it will be fine this time, too," you continue.</p>
 								<<set '"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.
-								<p>$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.</p>
+								<p><<=$npcs.get($npclastgenerated,'nickname')>> has already produced another tube and hands it to Katja, who takes it with unsteady hands. You both lower your heads to the table.</p>
 								<<set '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.')>>
 								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.
 								<<actCLA 'Continue talking'>>
@@ -193,7 +193,7 @@
 										<<set 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.
 										<<set '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.')>>
-										<p>"Well, more for me then," $boyname says and does a few more lines before packing away the drugs.</p>
+										<p>"Well, more for me then," <<=$npcs.get($npclastgenerated,'nickname')>> says and does a few more lines before packing away the drugs.</p>
 										<<actCLA 'Continue talking'>>
 											<<gt 'katja_city_sex' 'after_drugs'>>
 										<</actCLA>>
@@ -205,7 +205,7 @@
 									<<set $time.minutes += 5>>
 									<<gs 'katja_procedural' 'take_cocaine'>>
 									<<image "pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg">>
-									<p>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.</p>
+									<p>You watch as Katja takes the tube, puts one end at her nose and bends down to the start of the line that <<=$npcs.get($npclastgenerated,'nickname')>> has prepared for her.</p>
 									She then sniffs the line with no problem and just sits up waiting for the the drugs to hit her.
 									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.
 									<<actCLA 'Continue talking'>>
@@ -219,8 +219,8 @@
 							<<gs 'drugs' 'cocaine'>>
 							<<gs 'katja_procedural' 'take_cocaine'>>
 							<<image "pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg">>
-							<p>"Come on, Katja. Let's do it together," you say as you take the tube from $boyname.</p>
-							<p>She agrees and $boyname hands her another tube and Katja takes it happily.</p>
+							<p>"Come on, Katja. Let's do it together," you say as you take the tube from <<=$npcs.get($npclastgenerated,'nickname')>>.</p>
+							<p>She agrees and <<=$npcs.get($npclastgenerated,'nickname')>> hands her another tube and Katja takes it happily.</p>
 							You put your tubes to your nostrils and lower your heads to the table and sniff your line. Katja does it with great enthusiasm.
 							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.
 							<<actCLA 'Continue talking'>>
@@ -269,7 +269,7 @@
 											<p>"You aren't my mom!" Katja says.</p>
 											"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.
-											<p>"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.</p>
+											<p>"Well, more for me then," <<=$npcs.get($npclastgenerated,'nickname')>> says and does a few more lines before packing away the drugs. Katja looks longingly at the drugs while he's doing so.</p>
 											<<actCLA 'Continue talking'>>
 												<<gt 'katja_city_sex' 'after_drugs'>>
 											<</actCLA>>
@@ -282,7 +282,7 @@
 									<<set $time.minutes += 5>>
 									<<gs 'katja_procedural' 'take_cocaine'>>
 									<<image "pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg">>
-									<p>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.</p>
+									<p>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 <<=$npcs.get($npclastgenerated,'nickname')>> has prepared for her.</p>
 									She then sniffs the line like a pro and sits up, waiting for the the drugs to hit her.
 									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.
 									<<actCLA 'Continue talking'>>
@@ -297,7 +297,7 @@
 							<<gs 'katja_procedural' 'take_cocaine'>>
 							<<image "pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg">>
 							"Okay, Katja. Let''s do it together," you say.
-							<p>"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.</p>
+							<p>"Yes! That's the spirit," she replies as she has already taken the tube from <<=$npcs.get($npclastgenerated,'nickname')>>. He quickly produces another one and hands it to you.</p>
 							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.
 							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.
 							<<actCLA 'Continue talking'>>
@@ -308,10 +308,10 @@
 				<</actCLA>>
 			<</if>>
 		<<else>>
-			<p>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.</p>
+			<p>Soon, you are relaxing and having some wine. <<=$npcs.get($npclastgenerated,'nickname')>>'s free hand gently caresses your and Katja's thighs on occasion. Katja return his touch and you do the same.</p>
 			<<if func('katja_procedural', 'willing_to_be_naughty') > 80 and $katjaQW['horny'] >= rand(70,100)>>
 				<p>After a short while of touching, Katja asks, "Why don't you show us your bedroom?"</p>
-				<p>$boyname quickly gets up and says, "Right this way."</p>
+				<p><<=$npcs.get($npclastgenerated,'nickname')>> quickly gets up and says, "Right this way."</p>
 				<<actCLA 'Go to his bedroom'>>
 					<<gt 'katja_city_sex' 'one_guy_start'>>
 				<</actCLA>>
@@ -327,10 +327,10 @@
 <</if>>
 <<if $location_var[$here][0] == 'after_drugs'>>
 	<center><<image `'images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy'+rand(1,2)+'.jpg'`>></center>
-	<p>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.</p>
+	<p>Soon you are relaxing and having some wine. <<=$npcs.get($npclastgenerated,'nickname')>>'s free hand gently caresses your and Katja's thighs on occasion. Katja return his touch and you do the same.</p>
 	<<if func('katja_procedural', 'willing_to_be_naughty') > 80 and $katjaQW['horny'] >= rand(70,100)>>
 		<p>After a short while of touching, Katja asks, "Why don't you show us your bedroom?"</p>
-		<p>$boyname quickly gets up and says, "Right this way."</p>
+		<p><<=$npcs.get($npclastgenerated,'nickname')>> quickly gets up and says, "Right this way."</p>
 		<<actCLA 'Go to his bedroom'>>
 			<<gt 'katja_city_sex' 'one_guy_start'>>
 		<</actCLA>>
@@ -346,55 +346,55 @@
 	<<arouse 'kiss' 3 `['group']`>>
 	<<setinit $katjaQW['horny'] += rand(5,10)>>
 	<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/kiss_guy_katja_watch.jpg">>
-	<p>You take the initiative, and bring $boyname's face to yours and start to kiss him. Suddenly, his hands are all over your body.</p>
+	<p>You take the initiative, and bring <<=$npcs.get($npclastgenerated,'nickname')>>'s face to yours and start to kiss him. Suddenly, his hands are all over your body.</p>
 	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.
 	<<actCLA 'Katja`s turn'>>
 		<<arouse 'kiss' 3 `['group','lesbian']`>>
 		<<setinit $katjaQW['horny'] += rand(10,20)>>
 		<<image "characters/pavlovsk/school/girl/katja/katja_kiss.jpg">>
-		<p>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.</p>
+		<p>You gently push <<=$npcs.get($npclastgenerated,'nickname')>> 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.</p>
 		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.
-		<p>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."</p>
+		<p>To not ruin the mood, you quickly turn to <<=$npcs.get($npclastgenerated,'nickname')>> and ask in your most seductive voice, "Maybe you could show us the rest of your apartment."</p>
 		He gets your intention. "Of course, follow me. Let''s start with the bedroom," he says as he shows you the way.
 		<<actCLA 'Go to his bedroom'>>
 			<<arouse 'kiss' 3 `['group','lesbian']`>>
 			<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex1.jpg">>
-			<p>$boyname's bedroom is, like the rest of his apartment, quite nice. The center of the room, his bed, is ready for action.</p>
+			<p><<=$npcs.get($npclastgenerated,'nickname')>>'s bedroom is, like the rest of his apartment, quite nice. The center of the room, his bed, is ready for action.</p>
 			"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.
-			<p>"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.</p>
-			<p>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.</p>
+			<p>"Let's show <<=$npcs.get($npclastgenerated,'nickname')>> what he has to look forward to," you whisper to Katja as you get up on all four displaying your behind to <<=$npcs.get($npclastgenerated,'nickname')>>.</p>
+			<p>Katja does the same and <<=$npcs.get($npclastgenerated,'nickname')>> says, "What a fantastic view!" Katja leans in and gives you a soft kiss, and you can hear <<=$npcs.get($npclastgenerated,'nickname')>> stripping his clothes off behind you.</p>
 			<<actCLA 'Start by sucking his dick'>>
 				<<arouse 'bj' 3 `['group']`>>
 				<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex2.jpg">>
-				<p>"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.</p>
+				<p>"This is a really comfortable bed. Why don't you join us?" you ask and <<=$npcs.get($npclastgenerated,'nickname')>> immediately lies down on the bed between Katja and yourself.</p>
 				<p>You sit down and start licking the sides of his dick cm $dick_girth cock, while Katja looks on nervously.</p>
 				<p>"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.</p>
 				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.
 				<<actCLA 'Show Katja how to ride cock'>>
 					<<setinit $katjaQW['horny'] += rand(5,10)>>
 					<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex3.jpg">>
-					<p>"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.</p>
-					<p>You climb up on $boyname and sit down on his $dick_girth cock and start riding him cowgirl style.</p>
+					<p>"Time for you to see how sex works," you tell Katja as you remove your mouth from <<=$npcs.get($npclastgenerated,'nickname')>>'s cock. Katja sits up and looks at you with interest.</p>
+					<p>You climb up on <<=$npcs.get($npclastgenerated,'nickname')>> and sit down on his $dick_girth cock and start riding him cowgirl style.</p>
 					Katja gets close and looks intently at his cock going in and out of your pussy.
 					<<arouse 'vaginal' 3 `['group']`>>
 					<<actCLA 'Change position'>>
 						<<arouse 'erotic_nudity' 3 `['group']`>>
 						<<setinit $katjaQW['horny'] += rand(10,20)>>
 						<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex4.jpg">>
-						<p>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.</p>
-						<p>Katja does as you ask and '+iif(npc_throat['A14'] < dick/2, 'tries to take', 'takes')+' $boyname's  $dick_girth dick in her mouth.</p>
+						<p>You scoot forward and <<=$npcs.get($npclastgenerated,'nickname')>>'s cock pops out of your pussy. "Why don't you suck on his cock some more, Katja?" you ask the redhead.</p>
+						<p>Katja does as you ask and '+iif(npc_throat['A14'] < dick/2, 'tries to take', 'takes')+' <<=$npcs.get($npclastgenerated,'nickname')>>'s  $dick_girth dick in her mouth.</p>
 						<<if $npcs.get('A14','throat') < $dick / 2>>
 							<<setinit $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 $npcs.get('A14','throat') < $dick>>
-							<p>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.</p>
+							<p>Katja starts to blow <<=$npcs.get($npclastgenerated,'nickname')>> but she's clearly having problems with taking all of his cock, and after trying for a few minutes, she gives up.</p>
 						<<elseif $npcs.get('A14','throat') < 2 * $dick>>
 							<<setinit $katjaQW['slut'] += 2>>
-							<p>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.</p>
+							<p>Katja starts to blow <<=$npcs.get($npclastgenerated,'nickname')>> and she's able to take most of his cock without a problem. After sucking him for a few minutes, she stops.</p>
 						<<else>>
 							<<setinit $katjaQW['slut'] += 4>>
-							<p>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.</p>
+							<p>Katja starts to blow <<=$npcs.get($npclastgenerated,'nickname')>> and she's able to take all of his cock like a pro. After sucking him for a few minutes, she stops.</p>
 						<</if>>
 						<<if $npcs.get('A14','throat') < $dick>>
 							<<run $npcs.inc('A14','throat',1)>>
@@ -404,40 +404,40 @@
 							<<setinit $katjaQW['horny'] += rand(5,10)>>
 							<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex5.jpg">>
 							"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.
-							<p>"Hold my legs," you tell her, as you spread and lift them in the air to give $boyname full access to your pussy.</p>
-							<p>"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.</p>
+							<p>"Hold my legs," you tell her, as you spread and lift them in the air to give <<=$npcs.get($npclastgenerated,'nickname')>> full access to your pussy.</p>
+							<p>"Look carefully, Katja, this is what's going to happen to you next," you say as <<=$npcs.get($npclastgenerated,'nickname')>> puts his cook in your pussy and start thrusting.</p>
 							Katja looks intently at his cock pumping in and out of your wet pussy.
 							<<arouse 'vaginal' 3 `['group']`>>
 							<<actCLA 'Katja`s turn'>>
 								<<setinit $katjaQW['horny'] += rand(5,10)>>
 								<<arouse 'erotic_nudity' 3 `['group']`>>
 								<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex6.jpg">>
-								<p>After a few minutes, you stop $boyname and after he pulls out, you look up at Katja. "Your turn now."</p>
-								<p>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.</p>
-								<p>$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."</p>
-								<p>"I will. Don't worry, I'll take good care of you," $boyname says before he pushes his cock into her pussy.</p>
+								<p>After a few minutes, you stop <<=$npcs.get($npclastgenerated,'nickname')>> and after he pulls out, you look up at Katja. "Your turn now."</p>
+								<p>You switch places with her and hold up her legs to give <<=$npcs.get($npclastgenerated,'nickname')>> access. You look at Katja to see how she handles her first cock.</p>
+								<p><<=$npcs.get($npclastgenerated,'nickname')>> 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."</p>
+								<p>"I will. Don't worry, I'll take good care of you," <<=$npcs.get($npclastgenerated,'nickname')>> says before he pushes his cock into her pussy.</p>
 								<<actCLA 'Penetration'>>
 									<<if $npcs.get('A14','vag') == 0>>
 										<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7a.jpg">>
 										<<setinit $katjaQW['horny'] -= rand(20,40)>>
 										<<setinit $katjaQW['slut'] -= 5>>
-										<p>$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.</p>
+										<p><<=$npcs.get($npclastgenerated,'nickname')>> slowly guides his cock into Katja, who's clearly feeling uncomfortable with it. He comes to a halt; apparently he has reached her hymen.</p>
 										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.
-										<p>$boyname just keeps his cock still for a time while Katja's pain subsides and her breathing returns to normal.</p>
+										<p><<=$npcs.get($npclastgenerated,'nickname')>> just keeps his cock still for a time while Katja's pain subsides and her breathing returns to normal.</p>
 										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 $npcs.get('A14','vag') < $dick>>
 										<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7a.jpg">>
 										<<setinit $katjaQW['horny'] += rand(5,10)>>
 										<<setinit $katjaQW['slut'] -= 2>>
-										<p>$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."</p>
+										<p><<=$npcs.get($npclastgenerated,'nickname')>> slowly guides his cock into Katja who's clearly feeling some pain. But when he seems to stop, Katja says, "You can... go on."</p>
 										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>>
 										<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7b.jpg">>
 										<<setinit $katjaQW['horny'] += rand(20,40)>>
 										<<setinit $katjaQW['slut'] += 2>>
-										<p>$boyname slowly guides his cock into Katja, who looks on with big eyes.</p>
+										<p><<=$npcs.get($npclastgenerated,'nickname')>> slowly guides his cock into Katja, who looks on with big eyes.</p>
 										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.
 									<</if>>
@@ -454,7 +454,7 @@
 										<<setinit $katjaQW['horny'] += rand(5,10)>>
 										<<setinit $katjaQW['slut'] += 2>>
 										<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex8.jpg">>
-										<p>"Come on, move faster... Fuck me!" Katja moans and $boyname does not need to be asked twice.</p>
+										<p>"Come on, move faster... Fuck me!" Katja moans and <<=$npcs.get($npclastgenerated,'nickname')>> does not need to be asked twice.</p>
 										<p>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.</p>
 										<<arouse 'erotic_nudity' 3 `['group']`>>
 										<<actCLA 'Your turn again'>>
@@ -467,9 +467,9 @@
 
 											-->
 											<<warn "CONVERSION ERROR 46ace0b8d766dbb89d422ebfbd5ed7fe">>
-											<p>$boyname pulls out and he, too, seems exhausted, so you tell him, "Lay down, I'll take care of you".</p>
+											<p><<=$npcs.get($npclastgenerated,'nickname')>> pulls out and he, too, seems exhausted, so you tell him, "Lay down, I'll take care of you".</p>
 											He lies down on his back. You climb on top and start riding his hard cock.
-											<p>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.</p>
+											<p>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 <<=$npcs.get($npclastgenerated,'nickname')>>'s cock.</p>
 											<<if getvar("$katjaQW['horny']") >= 100>>
 												 <<setinit $katjaQW['slut'] += 2>>
 
@@ -486,21 +486,21 @@
 												<<actCLA 'Get pounded one more time'>>
 													<<setinit $katjaQW['horny'] += rand(5,10)>>
 													<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex11.jpg">>
-													<p>"This isn't working. Get off," $boyname says after a few minutes of awkward sex and Katja obliges.</p>
-													<p>"You," he points at you. "Get down on all four and shove that $pc_desc['butt'] ass in the air," $boyname commands.</p>
+													<p>"This isn't working. Get off," <<=$npcs.get($npclastgenerated,'nickname')>> says after a few minutes of awkward sex and Katja obliges.</p>
+													<p>"You," he points at you. "Get down on all four and shove that $pc_desc['butt'] ass in the air," <<=$npcs.get($npclastgenerated,'nickname')>> commands.</p>
 													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.
 													<<arouse 'vaginal' 3 `['group']`>>
 													<<arouse 'clit_finger' -2 `['group','lesbian']`>>
 													<<actCLA 'Last switch'>>
 														<<setinit $katjaQW['horny'] += rand(10,20)>>
 														<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex12.jpg">>
-														<p>"I want to fuck the redhead again, before I cum," $boyname says as he gets off you. Katja quickly takes your position.</p>
+														<p>"I want to fuck the redhead again, before I cum," <<=$npcs.get($npclastgenerated,'nickname')>> says as he gets off you. Katja quickly takes your position.</p>
 														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 getvar("$katjaQW['horny']") >= 100>>
 															<<setinit $katjaQW['horny'] = 0>>
 															<<setinit $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.
-															<p>Just a short moment afterward, $boyname jumps off and yells, "Get down on your knees, I want to cum on your faces!".</p>
+															<p>Just a short moment afterward, <<=$npcs.get($npclastgenerated,'nickname')>> jumps off and yells, "Get down on your knees, I want to cum on your faces!".</p>
 														<<else>>
 															<p>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!"</p>
 														<</if>>
@@ -509,7 +509,7 @@
 															<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex12.jpg">>
 															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.
 															<p>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.</p>
-															<p>You continue to make out for a while. When you get up, $boyname has laid down on his bed, looking very exhausted.</p>
+															<p>You continue to make out for a while. When you get up, <<=$npcs.get($npclastgenerated,'nickname')>> has laid down on his bed, looking very exhausted.</p>
 															"We will have to use your bathroom," you tell him and he just waves his hand in its direction.
 															<<arouse 'kiss' 3 `['lesbian']`>>
 															<<arousalEnd>>
@@ -521,10 +521,10 @@
 																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>>
-																	<p>When you return to $boyname, he has fallen asleep, so you and Katja decide to see yourself out.</p>
+																	<p>When you return to <<=$npcs.get($npclastgenerated,'nickname')>>, he has fallen asleep, so you and Katja decide to see yourself out.</p>
 																<<else>>
-																	<p>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.</p>
-																	<p>"OK, and it's me who owes you for a fantastic time. Hope you can see yourself out," $boyname answers.</p>
+																	<p>When you return to <<=$npcs.get($npclastgenerated,'nickname')>>, 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.</p>
+																	<p>"OK, and it's me who owes you for a fantastic time. Hope you can see yourself out," <<=$npcs.get($npclastgenerated,'nickname')>> answers.</p>
 																<</if>>
 																<<actCLA 'Leave the apartment'>>
 																	<<gt 'katja_city_sex' 'going_home'>>
@@ -548,7 +548,7 @@
 <<if $location_var[$here][0] == 'one_guy_start'>>
 	<<arouse 'kiss' 3 `['group','lesbian']`>>
 	<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex1.jpg">>
-	<p>$boyname's bedroom is, like the rest of his apartment, quite nice. The center of the room, his bed, is ready for action.</p>
+	<p><<=$npcs.get($npclastgenerated,'nickname')>>'s bedroom is, like the rest of his apartment, quite nice. The center of the room, his bed, is ready for action.</p>
 	"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.
 	<!-- FAILED TO CONVERT
 		'"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.'
@@ -557,8 +557,8 @@
 
 	-->
 	<<warn "CONVERSION ERROR 3fc58bb766aae813ee900312e6633ce4">>
-	<p>"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.</p>
-	<p>Katja does the same and $boyname says, "What a fantastic view!"</p>
+	<p>"Let's show <<=$npcs.get($npclastgenerated,'nickname')>> what he has to look forward to," you whisper to Katja as you get up on all four, displaying your behind to <<=$npcs.get($npclastgenerated,'nickname')>>.</p>
+	<p>Katja does the same and <<=$npcs.get($npclastgenerated,'nickname')>> says, "What a fantastic view!"</p>
 	Katja leans in and gives you a soft kiss, and you hear clothes being taken off behind you.
 	<<actCLA 'Start by sucking his dick'>>
 		<<arouse 'bj' 3 `['group']`>>
@@ -570,29 +570,29 @@
 
 		-->
 		<<warn "CONVERSION ERROR 89accad54ff620ef947fa62db71f09d2">>
-		<p>$boyname immediately lies down on the bed between Katja and yourself.</p>
+		<p><<=$npcs.get($npclastgenerated,'nickname')>> immediately lies down on the bed between Katja and yourself.</p>
 		<p>You and Katja both sit down and start licking the sides of his dick cm $dick_girth cock.</p>
 		<<actCLA 'Time to fuck'>>
 			<<setinit $katjaQW['horny'] += rand(5,10)>>
 			<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex5.jpg">>
-			<p>"Time to ride some cock!" you tell Katja as you remove your mouth from $boyname's dick. Katja also stops licking.</p>
+			<p>"Time to ride some cock!" you tell Katja as you remove your mouth from <<=$npcs.get($npclastgenerated,'nickname')>>'s dick. Katja also stops licking.</p>
 			"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.
-			<p>"Hold my legs," you tell Katja as you spread and lift them in the air to give $boyname full access to your pussy.</p>
-			<p>Katja looks intently as $boyname puts his cock in your pussy and starts fucking you.</p>
+			<p>"Hold my legs," you tell Katja as you spread and lift them in the air to give <<=$npcs.get($npclastgenerated,'nickname')>> full access to your pussy.</p>
+			<p>Katja looks intently as <<=$npcs.get($npclastgenerated,'nickname')>> puts his cock in your pussy and starts fucking you.</p>
 			<<arouse 'vaginal' 3 `['group']`>>
 			<<actCLA 'Katja`s turn'>>
 				<<if $npcs.get('A14','vag') < $dick>>
 					<<setinit $katjaQW['horny'] += rand(5,10)>>
 					<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7a.jpg">>
-					<p>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.</p>
-					<p>$boyname guides his cock into Katja, who's clearly feeling some pain. But when he seems to stop, Katja says, "You can... go on."</p>
+					<p>After a few minutes, you stop <<=$npcs.get($npclastgenerated,'nickname')>> and after he pulls out, you say, "Your turn now, Katja." You switch places with her and she holds up her legs to give <<=$npcs.get($npclastgenerated,'nickname')>> access.</p>
+					<p><<=$npcs.get($npclastgenerated,'nickname')>> guides his cock into Katja, who's clearly feeling some pain. But when he seems to stop, Katja says, "You can... go on."</p>
 					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>>
 					<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7b.jpg">>
 					<<setinit $katjaQW['horny'] += rand(20,40)>>
 					<<setinit $katjaQW['slut'] += 4>>
-					<p>$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.</p>
+					<p><<=$npcs.get($npclastgenerated,'nickname')>> guides his cock into Katja and when he meets very little resistance, he starts to fuck her just as hard as he did you.</p>
 					Katja  starts to moan and is clearly enjoying the fuck.
 				<</if>>
 				<<if $npcs.get('A14','vag') < $dick>>
@@ -607,7 +607,7 @@
 				<<actCLA 'Katja gets fucked'>>
 					<<setinit $katjaQW['horny'] += rand(5,10)>>
 					<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex8.jpg">>
-					<p>"Come on, move faster... Fuck me!" Katja moans and $boyname does not need to be asked twice.</p>
+					<p>"Come on, move faster... Fuck me!" Katja moans and <<=$npcs.get($npclastgenerated,'nickname')>> does not need to be asked twice.</p>
 					<p>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.</p>
 					<<arouse 'erotic_nudity' 3 `['group']`>>
 					<<actCLA 'Your turn again'>>
@@ -620,9 +620,9 @@
 
 						-->
 						<<warn "CONVERSION ERROR 21bc72c550eeeb9b8c609f0911d05c57">>
-						<p>$boyname pulls out and also seems exhausted, so you tell him, "Lay down, and I'll take care of you."</p>
+						<p><<=$npcs.get($npclastgenerated,'nickname')>> pulls out and also seems exhausted, so you tell him, "Lay down, and I'll take care of you."</p>
 						He lies down on his back before you climb on top of him and start riding his hard cock.
-						<p>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.</p>
+						<p>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 <<=$npcs.get($npclastgenerated,'nickname')>>'s cock.</p>
 						<<if getvar("$katjaQW['horny']") >= 100>>
 							 <<setinit $katjaQW['slut'] += 2>>
 
@@ -633,18 +633,18 @@
 							<<arouse 'erotic_nudity' 3 `['group']`>>
 							<<setinit $katjaQW['horny'] += rand(10,20)>>
 							<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex4.jpg">>
-							<p>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?"</p>
-							<p>Katja does as you say and '+iif(npc_throat['A14'] < dick/2, 'tries to take', 'takes')+' $boyname's $dick_girth in her mouth.</p>
+							<p>After a while, you've also had enough and scoot forward and <<=$npcs.get($npclastgenerated,'nickname')>>'s cock pops out of your pussy. "Why don't you suck on his cock some more, Katja?"</p>
+							<p>Katja does as you say and '+iif(npc_throat['A14'] < dick/2, 'tries to take', 'takes')+' <<=$npcs.get($npclastgenerated,'nickname')>>'s $dick_girth in her mouth.</p>
 							<<if $npcs.get('A14','throat') < $dick / 2>>
 								<<setinit $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 $npcs.get('A14','throat') < $dick>>
-								<p>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.</p>
+								<p>Katja then starts to blow <<=$npcs.get($npclastgenerated,'nickname')>> but is clearly having problems with taking all of his cock, and after trying for a few minutes, she gives up.</p>
 							<<elseif $npcs.get('A14','throat') < 2 * $dick>>
-								<p>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.</p>
+								<p>Katja then starts to blow <<=$npcs.get($npclastgenerated,'nickname')>> and is able to take most of his cock without a problem. After blowing him for a few minutes, she stops.</p>
 							<<else>>
 								<<setinit $katjaQW['slut'] += 2>>
-								<p>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.</p>
+								<p>Katja then starts to blow <<=$npcs.get($npclastgenerated,'nickname')>> and is able to take all of his cock like a pro. After blowing him for a few minutes, she stops.</p>
 							<</if>>
 							<<if $npcs.get('A14','throat') < $dick>>
 								<<run $npcs.inc('A14','throat',1)>>
@@ -664,21 +664,21 @@
 								<<actCLA 'Get pounded one more time'>>
 									<<setinit $katjaQW['horny'] += rand(5,10)>>
 									<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex11.jpg">>
-									<p>"Let's change position," $boyname says after a few minutes of sex and Katja obliges.</p>
-									<p>He points at you. "Get down on all fours and shove that $pc_desc['butt'] ass in the air," $boyname commands.</p>
+									<p>"Let's change position," <<=$npcs.get($npclastgenerated,'nickname')>> says after a few minutes of sex and Katja obliges.</p>
+									<p>He points at you. "Get down on all fours and shove that $pc_desc['butt'] ass in the air," <<=$npcs.get($npclastgenerated,'nickname')>> commands.</p>
 									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.
 									<<arouse 'vaginal' 3 `['group']`>>
 									<<arouse 'clit_finger' -2 `['group','lesbian']`>>
 									<<actCLA 'Last switch'>>
 										<<setinit $katjaQW['horny'] += rand(10,20)>>
 										<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex12.jpg">>
-										<p>"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.</p>
+										<p>"I need to fuck the redhead one last time before I cum," <<=$npcs.get($npclastgenerated,'nickname')>> says as he gets off you, and Katja quickly takes your place.</p>
 										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 getvar("$katjaQW['horny']") >= 100>>
 											<<setinit $katjaQW['horny'] = 0>>
 											<<setinit $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.
-											<p>Just a short moment afterward, $boyname jumps off and yells, "Get down on your knees, I want cum on your faces!"</p>
+											<p>Just a short moment afterward, <<=$npcs.get($npclastgenerated,'nickname')>> jumps off and yells, "Get down on your knees, I want cum on your faces!"</p>
 										<<else>>
 											<p>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!"</p>
 										<</if>>
@@ -687,7 +687,7 @@
 											<<image "characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex12.jpg">>
 											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.
 											<p>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.</p>
-											<p>You continue to make out for a while. When you get up, $boyname has laid down on his bed, looking very exhausted.</p>
+											<p>You continue to make out for a while. When you get up, <<=$npcs.get($npclastgenerated,'nickname')>> has laid down on his bed, looking very exhausted.</p>
 											"We will have to use your bathroom," you tell him and he just waves his hand in the direction of it.
 											<<arouse 'kiss' 3 `['lesbian']`>>
 											<<arousalEnd>>
@@ -699,10 +699,10 @@
 												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>>
-													<p>When you return to $boyname, he has fallen asleep, so you and Katja decide to see yourself out.</p>
+													<p>When you return to <<=$npcs.get($npclastgenerated,'nickname')>>, he has fallen asleep, so you and Katja decide to see yourself out.</p>
 												<<else>>
-													<p>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.</p>
-													<p>"OK, and it's me who owes you for a fantastic time. Hope you can see yourself out," $boyname answers.</p>
+													<p>When you return to <<=$npcs.get($npclastgenerated,'nickname')>>, he lies still on the bed, exhausted. "Thanks for a great time. We'll be going now," you say while Katja has grown quiet.</p>
+													<p>"OK, and it's me who owes you for a fantastic time. Hope you can see yourself out," <<=$npcs.get($npclastgenerated,'nickname')>> answers.</p>
 												<</if>>
 												<<actCLA 'Leave the apartement'>>
 													<<gt 'katja_city_sex' 'going_home'>>

+ 6 - 1
sugarcube/src/autogenerated/unsorted/katja_party.tw

@@ -244,6 +244,11 @@
 <<if $location_var[$here][0] == 'party_preparations'>>
 	<<set $menu_off = 1>>
 	<<set $time.minutes += 5>>
+	<<if getvar("$katjaQW['party_location']") == 2>>
+		<<setinit $locat['katja'] = 53>>
+	<</if>>
+	<<setinit $locat['katja_rand2'] = $time.daystart>>
+	<<setinit $locat['katja_save2'] = $locat['katja']>>
 	<center><<image `'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.
@@ -392,7 +397,7 @@
 			<p>"What about this?" Katja asks.</p>
 			"Very nice. You will definitely be turning heads tonight."
 			<<actCLA 'Ask her to show some more'>>
-				<<image "characters/pavlovsk/school/girl/katja/uni/dorm/dressing_up_show_of_side_lewd.jpg">>
+				<<image "characters/pavlovsk/school/girl/katja/uni/dorm/dressing_up_show_of_side_lewd..jpg">>
 				<p>"You naughty girl," Katja says, but lifts up her skirt and reveals her smoothly shaven pussy. "Is this good enough for you?" she asks.</p>
 				<<set '"Perfect. So you're not wearing panties to the ' + iif(locat['katja'] = 53, 'club', 'party') + ' tonight?" you ask.'>>
 				<<if getvar("$katjaQW['pantiesQWstage']") >= 5 or (katjaQW['slut'] >= 100 and rand(0,1) == 0)>>

+ 2 - 2
sugarcube/src/autogenerated/unsorted/pav_parkev.tw

@@ -490,11 +490,11 @@
 			As you are walking along one of the trails, you come around a bend in the trees, and a naked girl is partially covering herself up ahead of you. When she sees you, she blushes and does her best to cover herself while shrieking, then runs off into the woods before you can ask if she needs help.
 		<<elseif getvar("$temprand") == 15>>
 			<<run $pc.skillExperienceGain('perception',rand(1,2))>>
-			<<image "locations/pavlovsk/park/event/walk/day/deep/panties_ground1.jpg">>
+			<<image "locations/pavlovsk/park/event/walk/day/deep/panties_tree1.jpg">>
 			<p>Walking along one of the trails opens into a small clearing just off to the side. You see something hanging from the trees, but as you get closer, it looks like significant bits of cloth. You take a couple of steps closer, wondering what it is, and then you realize it is three different pairs of panties hanging from the trees. As you quickly step back to the trail and continue your walk, you wonder exactly what happened back there. Why were the panties hung on the trees? You shake your head as you can't fathom a reason for it.</p>
 		<<elseif getvar("$temprand") == 16>>
 			<<run $pc.skillExperienceGain('perception',rand(1,2))>>
-			<<image "locations/pavlovsk/park/event/walk/day/deep/panties_tree1.jpg">>
+			<<image "locations/pavlovsk/park/event/walk/day/deep/panties_ground1.jpg">>
 			<p>Walking along one of the trails into a small clearing just off to the side, you see a bit of litter on the ground, but as you get closer, it looks odd. You take a few steps over, wondering what it is, before realizing that it's a bunch of different coloured panties lying on the ground. As you quickly step back to the trail and continue your walk, you wonder exactly what happened back there. Why were so many panties just left on the ground? You shake your head as you can't fathom a reason for it.</p>
 		<<elseif getvar("$temprand") == 17>>
 			<<image "locations/pavlovsk/park/event/walk/day/deep/selfie_pussy1.jpg">>

+ 2 - 0
sugarcube/src/autogenerated/unsorted/sex_ev_doggy.tw

@@ -128,6 +128,8 @@
 			<p>You've barely finished quivering when he pulls you off of him and rolls you onto your knees, pulling your hips back towards him. With one swift movement, he thrusts his cock into your still-quivering pussy. His actions earn him an involuntary gasp from your lips.</p>
 		<</if>>
 		"I'm not finished yet," he growls from behind you.
+		<<setinit $sex_ev['position'] = 'doggy'>>
+		<<setinit $sex_ev['pos_speed'] = 'doggysex_ev['speed']'>>
 		<!-- !!		act'Get fucked':gs'sex_ev_doggy', 'doggy_goto'-->
 		<<gs 'sex_ev_sex' 'fuck_continue'>>
 	<</actCLA>>

+ 2 - 0
sugarcube/src/autogenerated/unsorted/sex_ev_miss.tw

@@ -84,6 +84,8 @@
 			<p>You've barely finished quivering when he pulls you off of him and pushes you onto your back, immediately plunging his cock back inside you. The sudden penetration of your still-sensitive pussy elicits involuntary whimpers of protest from you, but it doesn't stop him for a moment, ramping into a steady rhythm.</p>
 		<</if>>
 		"I'm not finished yet," he growls.
+		<<setinit $sex_ev['position'] = 'miss'>>
+		<<setinit $sex_ev['pos_speed'] = 'misssex_ev['speed']'>>
 		<!-- !!		act'Get fucked':gs'sex_ev_miss', 'miss_goto'-->
 		<<gs 'sex_ev_sex' 'fuck_continue'>>
 	<</actCLA>>

+ 4 - 4
sugarcube/src/autogenerated/unsorted/sex_ev_sex.tw

@@ -274,12 +274,12 @@
 	<<if $sex_ev['position'] == $npcs.get($boy,'fav_pos') or rand(1,2) == 1>>
 		<<gs 'sex_ev_$sex_ev['position']' '$sex_ev['position']_girl_orgasm_continue'>>
 	<<else>>
-		<<if rand(1,3) == 1>>
+		<<if rand(1,2) == 1>>
 			<<gs 'sex_ev_miss' 'miss_girl_orgasm_continue'>>
-		<<elseif rand(1,2) == 1>>
-			<<gs 'sex_ev_doggy' 'doggy_girl_orgasm_continue'>>
 		<<else>>
-			<<gs 'sex_ev_cowgirl' 'cowgirl_girl_orgasm_continue'>>
+			<<gs 'sex_ev_doggy' 'doggy_girl_orgasm_continue'>>
+			<!-- !!		else-->
+			<!-- !!			gs 'sex_ev_cowgirl', 'cowgirl_girl_orgasm_continue'-->
 		<</if>>
 	<</if>>
 <</if>>

+ 2 - 2
sugarcube/src/autogenerated/unsorted/stat.tw

@@ -1003,9 +1003,9 @@
 
 	<</if>>
 	<!-- !!Arousal adjustments-->
-	<<if ($wardrobe.pantyworntype == 'salacious' and $wardrobe.braworntype == 'salacious') and $pc.horny < 25>>
+	<<if (getvar("$PanThinness") >= 5 and getvar("$BraThinness") >= 5) and $pc.horny < 25>>
 		<<set $pc.horny += 10>>
-	<<elseif $pc.horny < 10 and ($wardrobe.pantyworntype == 'salacious' or $wardrobe.braworntype == 'salacious')>>
+	<<elseif $pc.horny < 10 and (getvar("$PanThinness") >= 5 or getvar("$BraThinness") >= 5)>>
 		<<set $pc.horny += 5>>
 	<</if>>
 	<<if getvar("$aphrodisiac_timer") >= 1>>

+ 6 - 0
sugarcube/src/locations/stores/sportShop.tw

@@ -15,6 +15,12 @@
 			<<set 'You could buy a high - ERROR: FAILED TO CONVERT LITERAL: """quality <a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec:minut""" + ERROR: FAILED TO CONVERT LITERAL: """= 5""">> <<set $finances.cash -= 1000>> <<set $refillable_bottle = 1>> <<gt 'sportShop' 'start'">water bottle (1000 <b>₽</b>)</a> that you can carry around in your purse.'>>
 
 		-->
+			*p func ('$single_stock_item', 1, 'Skipping Rope', 500, 'skak', 'sportshop', 'start')
+	*p func ('$single_stock_item', 1, 'Hula Hoop', 1500, 'obruch', 'sportshop', 'start')
+	*P func ('$single_stock_item', 1, 'Book on Yoga', 1500, 'bookyog', 'sportshop', 'start')
+	*p func ('$single_stock_item', 1, 'Ice Skates', 3000, 'konki', 'sportshop', 'start')
+	*p func ('$single_stock_item', 1, 'Skis', 4000, 'pcs_ski_owned', 'sportshop', 'start')
+	*p func ('$single_stock_item', 1, 'Refillable Water Bottle', 1000, 'refillable_bottle', 'sportshop', 'start')
 		<<warn "CONVERSION ERROR b84f4304e1f13137cdc8a1a8180fd5c4">>
 	<<elseif getvar("$refillable_bottle") == 0 and ($finances.cash < 1000 or $wardrobe.purseEquipped == 0)>>
 		<p>The shop sells high-quality water bottles for 1,000 <b>₽</b>. You could carry one around in '+iif(bag > 0, 'your', 'a')+' purse.</p>

+ 40 - 0
sugarcube/src/npcs/katja/katja_city.tw

@@ -62,6 +62,46 @@
 		<<actCLA 'Start shopping'>>
 			<<gt 'katja_chat' 'chat1'>>
 		<</actCLA>>
+	<<elseif getvar("$locat['katja']") == 53>>
+		<<set $time.minutes += 10>>
+		<<set $loc = 'city_nightclub'>>
+		<<set $loc_arg = 'start'>>
+		<<set $menu_loc = 'city_nightclub'>>
+		<<set $menu_arg = 'start'>>
+		<<set $menu_off = 0>>
+		<<set $location_type = 'public_outdoors'>>
+		<<set $sexloc = 'city_nightclub'>>
+		<<gs 'themes' 'indoors'>>
+		You exit the metro station and walk to the nightclub, and get in line.
+		<<if $pc.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 $pc.hotcat > 7>>
+			<<set $time.minutes += 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 $pc.hotcat > 5>>
+			<<set $time.minutes += 10>>
+			You wait in line for some time, but finally it is your turn to be let in.
+		<<else>>
+			<<set $time.minutes += 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.
+		<</if>>
+		<<if $finances.cash >= 250>>
+			<<set $finances.cash -= 250>>
+			<p>You pay the fee of 250<b>₽</b>, and go into the club.</p>
+		<<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.
+		<</if>>
+		<<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.
+			<<actCLA 'Go to the dance floor'>>
+				<<gt 'katja_nightclub' 'dance'>>
+			<</actCLA>>
+		<<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.
+			<<actCLA 'Go to the bar'>>
+				<<gt 'katja_nightclub' 'bar_arrive'>>
+			<</actCLA>>
+		<</if>>
 	<<else>>
 		<<if getvar("$katjaQW['on_date']") == 1>>
 			<<setinit $katjaQW['on_date'] = 0>>

+ 2 - 1
sugarcube/src/npcs/katja/katja_dorm.tw

@@ -1214,9 +1214,10 @@
 						<<setinit $locat['katja'] = 53>>
 						<<setinit $locat['katja_rand2'] = $time.daystart>>
 						<<setinit $locat['katja_save2'] = $locat['katja']>>
+						<<setinit $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.
 						<<actCLA 'Prepare'>>
-							<<gt 'katja_party' 'party_preparations.'>>
+							<<gt 'katja_party' 'party_preparations'>>
 						<</actCLA>>
 					<</actCLA>>
 				<</actCLA>>