locations/Katja_nightclub.qsrc

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

locations/Katja_nightclub_sex.qsrc

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

locations/_attributes_coco_outfits.qsrc

@@ -1012,7 +1012,7 @@ elseif ARGS[1] = 160:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
-	CloPantsShortness = 6
+	CloPantsShortness = 5
 end
 
 --- $attributes_coco_outfits ---------------------------------

locations/agentned.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 		i = 0
 		'<h4>Rent Information</h4>'
 		:listing_rented_properties_loop
-			'You have <B><<property_days[i]>> days</B> remaining on the lease of your <<$property_display[i]>>, and your monthly rent is <<func(''agentned'', ''format_price_string'', property_rent[i])>><b>₽</b>. '+iif(money >= property_rent[i],'You can make a rent <a href="exec:money -= <<property_rent[i]>> & gs ''homes_properties'', ''add_rental_days'', ''<<$property_code[i]>>'' & gt ''agentned'', ''start''">payment</a> in cash to extend it.','You can''t afford to pay your rent at the moment')
+			'You have <B><<property_days[i]>> days</B> remaining on the lease of your <<$property_display[i]>>, and your monthly rent is <<func(''agentned'', ''format_price_string'', property_rent[i])>><b>₽</b>. '+iif(money >= property_rent[i],'You can make a rent <a href="exec: gs ''homes_properties'', ''pay_rent'', ''<<$property_code[i]>>'', ''cash'' & gt ''agentned'', ''start''">payment</a> in cash to extend it.','You can''t afford to pay your rent at the moment')
 				!! TODO: Make the duplication way less.
 				if $property_code[i] = 'city_apartment':
 					act 'Cancel the lease of the <<$property_display[i]>>':

locations/anush_bedroom_city.qsrc

@@ -77,6 +77,7 @@ if $ARGS[0] = 'anushroom':
 	'Against the opposite wall are a small computer desk, a <a href="exec:gt ''anush_bedroom_city'',''computer''">laptop</a> and a chair. Next to the desk is a <a href="exec:gt ''anush_bedroom_city'',''nushdresser''">dresser</a> with a decent sized flatscreen TV sitting on top of it. On the other side of the desk is a bookshelf with a relatively large collection of books. Hanging on the wall next to the shelves is an <a href="exec:gt ''anush_bedroom_city'',''guitar''">acoustic guitar</a> with an electric guitar right beside it. A skateboard is also leaning against one of the other walls next to the <a href="exec:gt ''anush_bedroom_city'',''nushcloset''">closet door</a>, along with some rollerblades in the corner.'
 	act 'Leave Anushka''s room': gt 'anushapt_city','hallway'
 	if locat['A144'] = 2:
+		if anushkaCityQW['first_visit'] = 1:anushkaCityQW['first_visit'] = 2
 		'<br>Anushka is lying on the bed, a mysterious smirk playing around her lips as she looks at you.'
 		act 'Talk to Anushka': locat['A144'] = 2 & gt 'anushkachat_city', 'chat'
 	end

locations/anushapt_city.qsrc

@@ -249,7 +249,7 @@ if $ARGS[0] = 'home':
 	!elseif (week = 6 and hour >= 16 and hour < 20) or (week = 6 and hour >= 8 and hour < 20):
 	elseif $AnushkaLocCity = 'home' and $ValentinLocCity = 'home':
 		*clr & cla
-		minute += 1
+		minut += 1
 		!locat['A144'] = 2
 		aptdoor = rand(1,2)
 		'You stand outside the door as you knock, waiting to see who answers it.'
@@ -901,8 +901,8 @@ if $ARGS[0] = 'nushlivroom':
 				'Anushka arches her eyebrows when you pull the strap-on out of your purse, then bites her lower lip. "Just what are you planning to do with that?"'
 				'You give her a grin. "I was thinking about fucking you with it, or maybe having you fuck me with it? With nobody home, it would be a crime to waste the freedom it gives us."'
 				'She gets flushed, and you can tell she is turned on. "Yeah? Well hand it over and I will fuck your tight little asshole until you scream for me."'
-				act 'Fuck her': gt 'anushkaev1', 'couch_strapon_give'
-				act 'Give her the strap-on': gt 'anushkaev1', 'couch_strapon_get'
+				act 'Fuck her': gt 'anushkaev1', 'couch_strapon_give', 'city'
+				act 'Give her the strap-on': gt 'anushkaev1', 'couch_strapon_get', 'city'
 			else
 				'Anushka reaches up and takes the strap-on from you. She takes a look at it then gives the straps a few good tugs while she checks the size of the dildo. "Pretty nice one. It''s a quality dildo and sturdy harness. You made a good choice." she says as she hands it back to you and turns her attention back to the movie. Taking the hint that she doesn''t want to play, you put the strap-on away and join her in watching the TV.'
 				act 'Watch the show with her':

locations/anushka_konstantinov_schedule.qsrc

@@ -133,20 +133,19 @@ end
 !! This function will create a text, already formatted, showing the current instruction to progress for this character. That means we can store all scheduling info here and there is no need to edit other files.
 if $ARGS[0] = 'journal':
 
-	$anushka_konstantinov_schedule_journal = ''
 	! City quest 
 	if anushkaCityQW['first_visit'] = 0:
-		$anushka_konstantinov_schedule_journal & 'You don''t know where she lives but you likely know her as you went to school with her.'
+		'You don''t know where she lives but you likely know her as you went to school with her.'
 	elseif anushkaCityQW['first_visit'] = 1:
-		$anushka_konstantinov_schedule_journal & 'She told you where her apartment in they city is but you have not been there with her.'
+		'She told you where her apartment in they city is but you have not been there with her.'
 	elseif anushkaCityQW['first_visit'] >= 2:
-		$anushka_konstantinov_schedule_journal & 'You have visited her at her apartment, you should visit her again.'
+		'You have visited her at her apartment, you should visit her again.'
 	end
 	!anushka_konstantinov_schedule_journal & *nl
 	if anushkaQW['kiss'] <= 5:
-		$anushka_konstantinov_schedule_journal & 'I think Anushka is really pretty and I would like to be more than just friends with her. Hopefully she will do more if we have done enough kissing.'
+		'I think Anushka is really pretty and I would like to be more than just friends with her. Hopefully she will do more if we have done enough kissing.'
 	elseif anushkaQW['kiss'] > 5:
-		$anushka_konstantinov_schedule_journal & 'Anushka is really pretty, I think I definitely want to go further than just kissing.'
+		'Anushka is really pretty, I think I definitely want to go further than just kissing.'
 	end
 
 end

locations/bank.qsrc

@@ -599,14 +599,16 @@ if $ARGS[0] = 'cikl':
 					gs 'homes_properties', 'cancel_rent', $property_code[i]
 				elseif bankAccount = 1 and karta >= property_rent[i]:
 					'<b><font color="green">Your rent payment of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>, has automatically been deducted from your bank account.</font></b>'
-					karta -= property_rent[i]
-					gs 'homes_properties', 'add_rent_days', $property_code[i]
+					gs 'homes_properties', 'pay_rent', $property_code[i], 'card'
+					!karta -= property_rent[i]
+					!gs 'homes_properties', 'add_rent_days', $property_code[i]
 				elseif bankAccount = 1 and karta + bankDebtLimit >= property_rent[i]:
 					'<b><font color="green">Your rent payment of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>, has automatically been deducted from your bank account and overdraw facility. Please contact your bank regarding your overdraw repayment.</font></b>'
-					karta -= property_rent[i]
-					gs 'homes_properties', 'add_rent_days', $property_code[i]
+					gs 'homes_properties', 'pay_rent', $property_code[i], 'card'
+					!karta -= property_rent[i]
+					!gs 'homes_properties', 'add_rent_days', $property_code[i]
 				elseif bankAccount = 0:
-					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>. To avoid eviction, please make manual payment as soon as possible.</font></b>'
+					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>. To avoid eviction, please make a manual payment as soon as possible.</font></b>'
 				else
 					nl
 					'<b><b><font color="red">Your card was declined during automatic rent deduction of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>. To avoid eviction, please rectify as soon as possible.</font></b>'

locations/bedrPar.qsrc

@@ -19,7 +19,7 @@ if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minute
 if $ARGS[0] = '' or $ARGS[0] = 'start':
 	if locat['Mother'] = 26 and fromoutside and $home['current'] = 'parents_home':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
-		if prezik > 0 and rand(1,3) = 1:
+		if prezik > 0 and rand(1,3) = 1 and mom['condoms'] = 0:
 			gt 'mother', 'condom_find'
 		elseif dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
 			gt 'mother', 'dildo_find'

locations/budgetclothes.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'clothes':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopgm_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopgm_outfits_filter'
 	end
 end
@@ -203,7 +203,7 @@ if $ARGS[0] = 'dresses':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopgm_dress_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopgm_dress_filter'
 	end
 end
@@ -260,7 +260,7 @@ if $ARGS[0] = 'office':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopoffice_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopoffice_filter'
 	end
 end
@@ -321,7 +321,7 @@ if $ARGS[0] = 'gm_maid':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopgm_maid_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopgm_maid_filter'
 	end
 end
@@ -373,7 +373,7 @@ if $ARGS[0] = 'gm_server':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopgm_server_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopgm_server_filter'
 	end
 end
@@ -428,7 +428,7 @@ if $ARGS[0] = 'school':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopgm_school_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopgm_school_filter'
 	end
 end

locations/city_center.qsrc

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

locations/city_kafe.qsrc

@@ -618,6 +618,8 @@ if $ARGS[0] = 'tips':
 	!! minimum and maximum at 100 and 500 with small randomisation
 	if workKafe['tips_total'] < 100: workKafe['tips_total'] = 110 - rand(0,20)
 	if workKafe['tips_total'] > 500: workKafe['tips_total'] = 510 - rand(0,20)
+	!! Give Sveta her tips
+	money += workKafe['tips_roll']
 	!! Reset daily modifier
 	workKafe['tips_roll'] = 0
 	!! Skill and attribute gains

locations/city_lake.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 
 	if car > 0 and cardrive = 4:
 		cardrive = 4
-		if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
+		if PCloswimwear = 0:
 			'<a href="exec:GS ''carF'', ''start''">Your <<$car>></a> is parked near the lake.'
 		else
 			'Your <<$car>> is parked nearby. You should get dressed into your clothes if you want to drive away.'

locations/city_market.qsrc

@@ -217,7 +217,7 @@ if $ARGS[0] = 'clo':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopmarket_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopmarket_outfits_filter'
 	end
 end

locations/city_nightclub.qsrc

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

locations/clothing.qsrc

@@ -287,7 +287,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_filter'
 			end
 		end
@@ -324,7 +324,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_office_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_office_filter'
 			end
 		end
@@ -361,7 +361,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_maid_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_maid_filter'
 			end
 		end
@@ -398,7 +398,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_server_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_server_filter'
 			end
 		end
@@ -440,7 +440,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_school_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_school_filter'
 			end
 		end
@@ -477,7 +477,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmisc_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmisc_filter'
 			end
 		end
@@ -527,7 +527,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopcats_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopcats_filter'
 			end
 		end
@@ -577,7 +577,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopflamingos_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopflamingos_filter'
 			end
 		end
@@ -627,7 +627,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopcoco_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopcoco_filter'
 			end
 		end
@@ -677,7 +677,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopfashionista_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopfashionista_filter'
 			end
 		end
@@ -727,7 +727,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmoncheri_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmoncheri_filter'
 			end
 		end
@@ -777,7 +777,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopscandalicious_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopscandalicious_filter'
 			end
 		end
@@ -828,7 +828,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopscandalicious_swim_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopscandalicious_swim_filter'
 			end
 		end
@@ -879,7 +879,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopallure_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopallure_filter'
 			end
 		end
@@ -916,7 +916,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopfancy_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopfancy_filter'
 			end
 		end
@@ -981,7 +981,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'looperoto__filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'looperoto__filter'
 			end
 		end
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopsalacious_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopsalacious_filter'
 			end
 		end
@@ -1083,7 +1083,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopdolls_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopdolls_filter'
 			end
 		end
@@ -1133,7 +1133,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopbomba_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopbomba_filter'
 			end
 		end
@@ -1210,7 +1210,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopnerdvana_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopnerdvana_filter'
 			end
 		end
@@ -1261,7 +1261,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopdanilovich_outfits_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopdanilovich_outfits_filter'
 			end
 		end
@@ -1298,7 +1298,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmarket_outfits_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmarket_outfits_filter'
 			end
 		end
@@ -1335,7 +1335,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmaterinstvo_dress_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmaterinstvo_dress_filter'
 			end
 		end
@@ -1348,7 +1348,7 @@ if $ARGS[0] = 'clothing_list':
 		clo_i += 1
 		if clothingfilter['quality'] = 0 and clo_i <= 7:
 			jump 'loopfilter_all'
-		elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 			jump 'loopfilter_all'
 		end
 		act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
@@ -1730,7 +1730,7 @@ if $ARGS[0] = 'strip_code':
 	CloStyle2 = 0
 	CloBimbo = 0
 	CloOnePiece = 0
-	PShoQuaility = 0
+	PShoQuality = 0
 	PShoCut = 0
 	PShoHeels = 0
 	PShoStyle = 0

locations/clothing_QV.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_filter'
 			end
 		end
@@ -171,7 +171,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_office_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_office_filter'
 			end
 		end
@@ -209,7 +209,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_maid_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_maid_filter'
 			end
 		end
@@ -248,7 +248,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_server_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_server_filter'
 			end
 		end
@@ -290,7 +290,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_school_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_school_filter'
 			end
 		end
@@ -354,7 +354,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopcats_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopcats_filter'
 			end
 		end
@@ -418,7 +418,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopflamingos_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopflamingos_filter'
 			end
 		end
@@ -482,7 +482,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopcoco_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopcoco_filter'
 			end
 		end
@@ -546,7 +546,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopfashionista_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopfashionista_filter'
 			end
 		end
@@ -602,7 +602,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmoncheri_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmoncheri_filter'
 			end
 		end
@@ -666,7 +666,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopscandalicious_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopscandalicious_filter'
 			end
 		end
@@ -705,7 +705,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopfancy_burlesque_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopfancy_burlesque_filter'
 			end
 		end
@@ -778,7 +778,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'looperoto__filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'looperoto__filter'
 			end
 		end
@@ -834,7 +834,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopsalacious_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopsalacious_filter'
 			end
 		end
@@ -898,7 +898,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopdolls_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopdolls_filter'
 			end
 		end
@@ -962,7 +962,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopbomba_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopbomba_filter'
 			end
 		end
@@ -1026,7 +1026,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopnerdvana_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopnerdvana_filter'
 			end
 		end
@@ -1066,7 +1066,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopdanilovich_outfits_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopdanilovich_outfits_filter'
 			end
 		end
@@ -1105,7 +1105,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmarket_outfits_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmarket_outfits_filter'
 			end
 		end
@@ -1144,7 +1144,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmaterinstvo_dress_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmaterinstvo_dress_filter'
 			end
 		end
@@ -1157,7 +1157,7 @@ if $ARGS[0] = 'clothing_list':
 		clo_i += 1
 		if clothingfilter['quality'] = 0 and clo_i <= 7:
 			jump 'loopfilter_all'
-		elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+		elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 			jump 'loopfilter_all'
 		end
 	end
@@ -1196,7 +1196,7 @@ if $ARGS[0] = 'gym':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopdanilovich_outfits_filter2'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 35:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopdanilovich_outfits_filter2'
 	end
 

locations/clothing_attributes.qsrc

@@ -81,14 +81,17 @@
 !!				1 Breasts can barely be seen through material if you look hard enough, inc. fine mesh
 !!
 !!	Figures for CloInhibit values, these are the maximums for each range. Currently all set to lowest figure in range but to add random element when time permits
-!!0:	dress:1					pants:1		top:2			thickness:2
+!!0:	dress:1					pants:1		top:2			thickness:2			
 !!5:	dress:2					pants:3		top:2			thickness:3
 !!10:	dress:3					pants:4		top:2			thickness:4
 !!15:	dress:3					pants:4		top:3			thickness:4
 !!20:	dress:4 				pants:4		top:3			thickness:4
 !!25:	dress:4 and CloPanties	pants:5		top:4			thickness:5
-!!30:	dress:5					pants:6		top: - CloBra	thickness:5
-!!35:	dress:6					pants:6		top: - CloBra	thickness:6
+!!30:	dress:5					pants:6		top: - CloBra	thickness:5									CloCoverTop:2
+!!35:	dress:6					pants:6		top: - CloBra	thickness:6			CloCoverFront:1			CloCoverTop:2
+!!40:																			CloCoverFront:2			CloCoverTop:3
+!!45:																			CloCoverFront:3			CloCoverTop:4
+!!50:																			CloCoverFront:4
 !!40-60:	All but Exhibit
 !!60+:	Can wear Exhibitionist clothing
 

locations/etoexhib.qsrc

@@ -1661,11 +1661,11 @@ if $ARGS[0] = 'pos53':
 
 				if krem = 0:
 					pcs_tan += 1
-					'You lie down to sunbathe.'
+					'You lay down to sunbathe.'
 				elseif krem > 0:
 					krem -= 1
 					pcs_tan += 3
-					'You put the sunblock on your body and lied down on the roof to sunbathe.'
+					'You put the sunblock on your body and lay down on the roof to sunbathe.'
 				end
 
 				act 'Get Up':gt 'etoexhib', 'pos53'

locations/exhibitionistshop.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'outfits':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopsalacious_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopsalacious_outfits_filter'
 	end
 end
@@ -201,7 +201,7 @@ if $ARGS[0] = 'dresses':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopsalacious_dress_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopsalacious_dress_filter'
 	end
 end

locations/father.qsrc

@@ -5,6 +5,7 @@
 fatherAge = year - ((npc_dob['A28'] - (npc_dob['A28'] mod 10000)) / 10000)
 gs 'family_schedule'
 gs 'stat'
+if $ARGS[0] = 'kit': $kit_dad = 1
 
 $location_type = 'event'
 
@@ -32,6 +33,11 @@ dynamic $fatherRep
 
 act 'Move away':gt $loc, $loc_arg
 
+if $kit_dad = 1 and locat['Stepdad'] ! 4:
+	'Your stepdad folds up his paper and leaves the kitchen.'
+	exit
+end
+
 !--------------------------------father comments on appearance changes------------------------------------------------
 ! hair color
 if hcolfronce = 0:

locations/fit.qsrc

@@ -561,7 +561,7 @@ if $ARGS[0] = 'exercise_end':
 			end
 		elseif RESULT = 2:
 			cla
-			'As you finish training, a fit girl offers to play a little squash with her as she waits for her boyfriend to came.'
+			'As you finish training, a fit girl offers to play a little squash with you as she waits for her boyfriend to come.'
 
 			act 'Refuse':gt 'fit', 'dressing_room'
 
@@ -570,9 +570,9 @@ if $ARGS[0] = 'exercise_end':
 				*clr
 				picrand = 15
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/sex/zal5.jpg"></center>'
-				'You have fun playing with the girl, neither of you are any good, but it just amuses you. After some time, it appears as a man and looking at your clumsy attempts and offers to show you how to play correctly.'
-				'He stands just behind you and puts one hand on your hand, guiding your racket and showing you how to strike the ball. The other hand starts stroking your hips gradually approaching your crotch.'
-				'You feel his cock resting against your back and looking at the girl, you know that she understands what is going on and that the man is her boyfriend.'
+				'You have fun playing with the girl. Neither of you are any good, but it just amuses you. After some time you notice a man looking at your clumsy attempts. He offers to show you how to play correctly.'
+				'He stands just behind you and puts one hand on your hand, guiding your racket and showing you how to strike the ball. He places his other hand on your side first. You feel his hand stroking your hip and gradually approaching your crotch. He pushes you a bit backwards, making your butt touch his groin.'
+				'You feel his cock resting against your back, poking it a bit. You make eye contact with the girl and her smile makes you know that she understands what is going on; this guy must be her boyfriend.'
 
 				act 'Escape from these perverts':gt 'fit', 'dressing_room'
 				act 'Enjoy':

locations/foto_model_documentary.qsrc

@@ -967,6 +967,7 @@ if $ARGS[0] = 'documentary_9':
 		cla & *clr
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
 		'"Pajamas!" you say. "They''re warm and cozy, I love cuddling up in my bed with PJ''s on."'
+		gs 'foto_model_documentary','documentary_10'
 	end
 end
 

locations/intro_customization.qsrc

@@ -156,14 +156,14 @@ if $ARGS[0] = 'modrel_setup2':
 	dynamic 'if <<$ARGS[1]>> < 0: <<$ARGS[1]>> = 0'
 	dynamic 'if <<$ARGS[1]>> > 100: <<$ARGS[1]>> = 100'
 	dynamic 'x = <<$ARGS[1]>>'
-	$table_display += '<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 100 & gt ''intro_customization'', $locM_arg">100</a></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 100 & gt ''intro_customization'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modrel_setup3':
 	dynamic 'if <<$ARGS[1]>> < 50: <<$ARGS[1]>> = 50'
 	dynamic 'if <<$ARGS[1]>> > 200: <<$ARGS[1]>> = 200'
 	dynamic 'x = <<$ARGS[1]>>'
-	$table_display += '<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/200)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 200 & gt ''intro_customization'', $locM_arg">200</a></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD><<$ARGS[2]>> (<<x>>/200)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 200 & gt ''intro_customization'', $locM_arg">200</a></TD>'
 end
 
 !!Values reversed just for inhib use
@@ -171,7 +171,7 @@ if $ARGS[0] = 'modrel_setup4':
 	dynamic 'if <<$ARGS[1]>> < 0: <<$ARGS[1]>> = 0'
 	dynamic 'if <<$ARGS[1]>> > 100: <<$ARGS[1]>> = 100'
 	dynamic 'x = 100-<<$ARGS[1]>>'
-	$table_display += '<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 100 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> += 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 0 & gt ''intro_customization'', $locM_arg">100</a></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 100 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> += 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 0 & gt ''intro_customization'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modite_cos':

locations/intro_sg_select.qsrc

@@ -502,7 +502,7 @@ if $ARGS[0] = 'nerdqueen':
 		gs 'grades', 'grade_award', 'school', 'his', 80
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'goodstudent':
@@ -544,7 +544,7 @@ if $ARGS[0] = 'goodstudent':
 		gs 'grades', 'grade_award', 'school', 'his', 90
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'computergeek':
@@ -587,7 +587,7 @@ if $ARGS[0] = 'computergeek':
 		gs 'grades', 'grade_award', 'school', 'his', 85
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'chessplayer':
@@ -624,7 +624,7 @@ if $ARGS[0] = 'chessplayer':
 		gs 'grades', 'grade_award', 'school', 'his', 85
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'jock':
@@ -715,7 +715,7 @@ if $ARGS[0] = 'volleyball':
 		gs 'grades', 'grade_award', 'school', 'his', 55
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'dancer':
@@ -769,7 +769,7 @@ if $ARGS[0] = 'dancer':
 		gs 'grades', 'grade_award', 'school', 'his', 55
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'runner':
@@ -808,7 +808,7 @@ if $ARGS[0] = 'runner':
 		gs 'grades', 'grade_award', 'school', 'his', 55
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'football':
@@ -851,7 +851,7 @@ if $ARGS[0] = 'football':
 		gs 'grades', 'grade_award', 'school', 'his', 55
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'cool':
@@ -933,7 +933,7 @@ if $ARGS[0] = 'socialite':
 		gs 'grades', 'grade_award', 'school', 'his', 65
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'beautiful':
@@ -994,7 +994,7 @@ if $ARGS[0] = 'beautiful':
 		gs 'grades', 'grade_award', 'school', 'his', 60
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'gopnik':
@@ -1095,7 +1095,7 @@ if $ARGS[0] = 'gopnikstart':
 		gs 'grades', 'grade_award', 'school', 'his', 25
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'troublemaker':
@@ -1152,7 +1152,7 @@ if $ARGS[0] = 'troublemaker':
 		gs 'grades', 'grade_award', 'school', 'his', 25
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'vitekgf':
@@ -1225,7 +1225,7 @@ if $ARGS[0] = 'vitekgf':
 		npc_sex['A9'] += 5
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'alternative':
@@ -1315,7 +1315,7 @@ if $ARGS[0] = 'alternative':
 		gs 'grades', 'grade_award', 'school', 'his', 25
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'outcast':
@@ -1383,7 +1383,7 @@ if $ARGS[0] = 'friendless':
 		gs 'grades', 'grade_award', 'school', 'his', 55
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'uglyduckling':
@@ -1426,7 +1426,7 @@ if $ARGS[0] = 'uglyduckling':
 		gs 'grades', 'grade_award', 'school', 'his', 55
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'goodgirl':
@@ -1484,7 +1484,7 @@ if $ARGS[0] = 'goodgirl':
 		gs 'grades', 'grade_award', 'school', 'his', 80
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'slut':
@@ -1589,7 +1589,7 @@ if $ARGS[0] = 'slut':
 		gs 'grades', 'grade_award', 'school', 'his', 55
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 if $ARGS[0] = 'goth':
@@ -1658,7 +1658,7 @@ if $ARGS[0] = 'goth':
 		gs 'grades', 'grade_award', 'school', 'his', 55
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 end
 
 

locations/intro_sg_select_custom.qsrc

@@ -302,10 +302,10 @@ if $ARGS[0] = 'modrel_fam':
 	*nl
 	*nl
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
-	'<TR bgcolor=#ffffff><TD>Stepfather: <<npc_rel[''A28'']>></TD><TD><a href="exec:npc_rel[''A28''] = 0 & gt ''intro_sg_select_custom'', ''modrel_fam''">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A28''] -= 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A28''] -= 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A28''] += 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A28''] += 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 10</a></TD><TD><a href="exec:npc_rel[''A28''] = 100 & gt ''intro_sg_select_custom'', ''modrel_fam''">100</a></TD>'
-	'<TR bgcolor=#ffffff><TD>Mother: <<npc_rel[''A29'']>></TD><TD><a href="exec:npc_rel[''A29''] = 0 & gt ''intro_sg_select_custom'', ''modrel_fam''">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A29''] -= 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A29''] -= 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A29''] += 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A29''] += 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 10</a></TD><TD><a href="exec:npc_rel[''A29''] = 100 & gt ''intro_sg_select_custom'', ''modrel_fam''">100</a></TD>'
-	'<TR bgcolor=#ffffff><TD>Sister: <<npc_rel[''A33'']>></TD><TD><a href="exec:npc_rel[''A33''] = 0 & gt ''intro_sg_select_custom'', ''modrel_fam''">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A33''] -= 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A33''] -= 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A33''] += 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A33''] += 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 10</a></TD><TD><a href="exec:npc_rel[''A33''] = 100 & gt ''intro_sg_select_custom'', ''modrel_fam''">100</a></TD>'
-	'<TR bgcolor=#ffffff><TD>Brother: <<npc_rel[''A34'']>></TD><TD><a href="exec:npc_rel[''A34''] = 0 & gt ''intro_sg_select_custom'', ''modrel_fam''">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A34''] -= 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A34''] -= 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A34''] += 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A34''] += 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 10</a></TD><TD><a href="exec:npc_rel[''A34''] = 100 & gt ''intro_sg_select_custom'', ''modrel_fam''">100</a></TD>'
+	'<TR bgcolor=<<$bcolor1>>><TD>Stepfather: <<npc_rel[''A28'']>></TD><TD><a href="exec:npc_rel[''A28''] = 0 & gt ''intro_sg_select_custom'', ''modrel_fam''">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A28''] -= 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A28''] -= 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A28''] += 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A28''] += 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 10</a></TD><TD><a href="exec:npc_rel[''A28''] = 100 & gt ''intro_sg_select_custom'', ''modrel_fam''">100</a></TD>'
+	'<TR bgcolor=<<$bcolor1>>><TD>Mother: <<npc_rel[''A29'']>></TD><TD><a href="exec:npc_rel[''A29''] = 0 & gt ''intro_sg_select_custom'', ''modrel_fam''">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A29''] -= 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A29''] -= 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A29''] += 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A29''] += 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 10</a></TD><TD><a href="exec:npc_rel[''A29''] = 100 & gt ''intro_sg_select_custom'', ''modrel_fam''">100</a></TD>'
+	'<TR bgcolor=<<$bcolor1>>><TD>Sister: <<npc_rel[''A33'']>></TD><TD><a href="exec:npc_rel[''A33''] = 0 & gt ''intro_sg_select_custom'', ''modrel_fam''">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A33''] -= 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A33''] -= 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A33''] += 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A33''] += 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 10</a></TD><TD><a href="exec:npc_rel[''A33''] = 100 & gt ''intro_sg_select_custom'', ''modrel_fam''">100</a></TD>'
+	'<TR bgcolor=<<$bcolor1>>><TD>Brother: <<npc_rel[''A34'']>></TD><TD><a href="exec:npc_rel[''A34''] = 0 & gt ''intro_sg_select_custom'', ''modrel_fam''">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A34''] -= 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''A34''] -= 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A34''] += 5 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''A34''] += 10 & gt ''intro_sg_select_custom'', ''modrel_fam''">plus 10</a></TD><TD><a href="exec:npc_rel[''A34''] = 100 & gt ''intro_sg_select_custom'', ''modrel_fam''">100</a></TD>'
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
 end
@@ -314,7 +314,7 @@ end
 if $ARGS[0] = 'modrel_setup':
 	if npc_rel['<<$ARGS[1]>>'] < 0: npc_rel['<<$ARGS[1]>>'] = 0
 	if npc_rel['<<$ARGS[1]>>'] > 100: npc_rel['<<$ARGS[1]>>'] = 100
-	$table_display += '<TR bgcolor=#ffffff><TD><<$npc_firstname[''<<$ARGS[1]>>'']>> <<$npc_lastname[''<<$ARGS[1]>>'']>>: <<npc_rel[''<<$ARGS[1]>>'']>></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 0 & gt ''intro_sg_select_custom'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 10 & gt ''intro_sg_select_custom'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 5 & gt ''intro_sg_select_custom'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 5 & gt ''intro_sg_select_custom'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 10 & gt ''intro_sg_select_custom'', $locM_arg">plus 10</a></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 100 & gt ''intro_sg_select_custom'', $locM_arg">100</a></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD><<$npc_firstname[''<<$ARGS[1]>>'']>> <<$npc_lastname[''<<$ARGS[1]>>'']>>: <<npc_rel[''<<$ARGS[1]>>'']>></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 0 & gt ''intro_sg_select_custom'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 10 & gt ''intro_sg_select_custom'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 5 & gt ''intro_sg_select_custom'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 5 & gt ''intro_sg_select_custom'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 10 & gt ''intro_sg_select_custom'', $locM_arg">plus 10</a></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 100 & gt ''intro_sg_select_custom'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modrel_pop':
@@ -335,8 +335,8 @@ if $ARGS[0] = 'modrel_pop':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A139'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A140'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 1, nstat & gt ''intro_sg_select_custom'',''modrel_pop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 1, nstat & gt ''intro_sg_select_custom'',''modrel_pop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 1, nstat & gt ''intro_sg_select_custom'',''modrel_pop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 1, nstat & gt ''intro_sg_select_custom'',''modrel_pop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
 	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
@@ -358,8 +358,8 @@ if $ARGS[0] = 'modrel_ath':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A150'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A141'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 2, nstat & gt ''intro_sg_select_custom'',''modrel_ath''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 2, nstat & gt ''intro_sg_select_custom'',''modrel_ath''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 2, nstat & gt ''intro_sg_select_custom'',''modrel_ath''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 2, nstat & gt ''intro_sg_select_custom'',''modrel_ath''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
 	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
@@ -379,8 +379,8 @@ if $ARGS[0] = 'modrel_ner':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A153'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A142'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 3, nstat & gt ''intro_sg_select_custom'',''modrel_ner''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 3, nstat & gt ''intro_sg_select_custom'',''modrel_ner''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 3, nstat & gt ''intro_sg_select_custom'',''modrel_ner''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 3, nstat & gt ''intro_sg_select_custom'',''modrel_ner''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
 	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
@@ -406,8 +406,8 @@ if $ARGS[0] = 'modrel_gop':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A144'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A145'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 4, nstat & gt ''intro_sg_select_custom'',''modrel_gop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 4, nstat & gt ''intro_sg_select_custom'',''modrel_gop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 4, nstat & gt ''intro_sg_select_custom'',''modrel_gop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 4, nstat & gt ''intro_sg_select_custom'',''modrel_gop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
 	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
@@ -422,8 +422,8 @@ if $ARGS[0] = 'modrel_out':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A7'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A159'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 5, nstat & gt ''intro_sg_select_custom'',''modrel_out''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-!!	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 5, nstat & gt ''intro_sg_select_custom'',''modrel_out''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 5, nstat & gt ''intro_sg_select_custom'',''modrel_out''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+!!	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 5, nstat & gt ''intro_sg_select_custom'',''modrel_out''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
 	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
@@ -447,8 +447,8 @@ if $ARGS[0] = 'modrel_tea':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A137'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A138'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all men in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 6, nstat & gt ''intro_sg_select_custom'',''modrel_tea''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all women in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 6, nstat & gt ''intro_sg_select_custom'',''modrel_tea''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all men in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 6, nstat & gt ''intro_sg_select_custom'',''modrel_tea''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=<<$bcolor1>>><TD>Set relationship level for all women in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 6, nstat & gt ''intro_sg_select_custom'',''modrel_tea''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
 	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'

locations/journal.qsrc

@@ -455,7 +455,7 @@ if $ARGS[0] = 'uni':
 	if university['diploma'] > 0:
 		'You have graduated from the University of St. Petersburg with a degree in '+func('uni_programs', 'program_name')+'.'
 	else
-		'You have are enrolled in the '+trim(MID('first, second, third, fourth, fifth, sixth, seventh, eighth, ninth, tenth', university['enrolled_in_semester']*8-7,7))+' semester of the '+func('uni_programs', 'program_name')+' at the University of St. Petersburg.'
+		'You have are enrolled in the '+trim(MID('  first, second,  third, fourth,  fifth,  sixth,seventh, eighth,  ninth,  tenth', university['enrolled_in_semester']*8-7,7))+' semester of the '+func('uni_programs', 'program_name')+' at the University of St. Petersburg.'
 	end
 
 	if $university['elective1'] ! '' or $university['elective2'] ! '' or $university['elective3'] ! '':
@@ -468,7 +468,7 @@ if $ARGS[0] = 'uni':
 	if university['semester_passed'] >= j:
 		gs 'grades', 'assing_grade_description', 'uni_<<$university[''enrolled_in'']>>_semester_<<j>>'
 		*nl
-		'You passed the'+trim(MID('first, second, third, fourth, fifth, sixth, seventh, eighth, ninth, tenth', j*8-7,7))+' semester with the following grades:'
+		'You passed the'+trim(MID('  first, second,  third, fourth,  fifth,  sixth,seventh, eighth,  ninth,  tenth', j*8-7,7))+' semester with the following grades:'
 		k = 0
 		:class_loop
 		if $class_list_institution[k] = 'uni_<<$university[''enrolled_in'']>>_semester_<<j>>':
@@ -502,7 +502,7 @@ if $ARGS[0] = 'uni':
 	elseif university['semester_week'] > 0:
 		if university['semester_week'] < 11:
 			*nl
-			'You are in the '+trim(MID('first, second, third, fourth, fifth, sixth, seventh, eighth, ninth, tenth', university['semester_week']*8-7,7))+' week of the semester, which last 15 weeks.'
+			'You are in the '+trim(MID('  first, second,  third, fourth,  fifth,  sixth,seventh, eighth,  ninth,  tenth', university['semester_week']*8-7,7))+' week of the semester, which last 15 weeks.'
 		else
 			*nl
 			'You are in the '+str(university['semester_week'])+'th week of the semester which last 15 weeks.'

locations/journal_quests.qsrc

@@ -598,7 +598,6 @@ if yearstart > 1:
 	'<center><h3>Anushka Konstantinov</h3></center>'
 	!*nl
 	gs 'anushka_konstantinov_schedule', 'journal'
-	$anushka_konstantinov_schedule_journal
 end
 
 --- journal_quests ---------------------------------

locations/katja_chat.qsrc

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

locations/katja_city.qsrc

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

locations/katja_city_sex.qsrc

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

locations/katja_dorm.qsrc

@@ -1094,7 +1094,7 @@ if $ARGS[0] = 'movie_talk1':
 	if week > 4 or KatjaQW['slut'] > 75:
 		act 'Tell her you would rather go out tonight':
 			cla
-			'"Why don''t we go out partying instead? It''ll be fun" you say. "I don''t know. I''m not sure I''m up for it tonight. I really want to watch this movie." Katja answers'
+			'"Why don''t we go out partying instead? It''ll be fun" you say.'
 			if katjaQW['horny'] >= 100:
 					gs 'willpower', 'misc', 'force', 'easy'
 			elseif katjaQW['horny'] < 50:
@@ -1102,23 +1102,29 @@ if $ARGS[0] = 'movie_talk1':
 			else
 				gs 'willpower', 'misc', 'force'
 			end
-			if will_cost <= pcs_willpwr:		
-				act 'Convince her to go out (<<will_cost>> Willpower)':
-					cla
-					katjaQW['dom'] -= rand(1,2)			
-					'"Come on Katja. It is boring just sitting watching a movie when you con be out partying the night away" you say trying to convince Katja to come with you.'
-					'"Okay then. I''l watch the movie another time. Where do you want to go?" she finally relents.'
-					act 'Go to the night club':
+			if week = 4 and university['exam_week'] = 1:
+				'"No. Not tonight. I need to be fresh so I can study tomorrow. I want to do well on my exam, so not tonight" Katja says.'
+			else
+				'"I don''t know. I''m not sure I''m up for it tonight. I really want to watch this movie." Katja answers.'
+				if will_cost <= pcs_willpwr:		
+					act 'Convince her to go out (<<will_cost>> Willpower)':
 						cla
-						locat['katja'] = 53
-						locat['katja_rand2'] = daystart
-						locat['katja_save2'] = locat['katja']						
-						'"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.'
+						katjaQW['dom'] -= rand(1,2)			
+						'"Come on Katja. It is boring just sitting watching a movie when you con be out partying the night away" you say trying to convince Katja to come with you.'
+						'"Okay then. I''l watch the movie another time. Where do you want to go?" she finally relents.'
+						act 'Go to the night club':
+							cla
+							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'
+						end
 					end
+				else
+					act 'Convince her to go out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-			else
-				act 'Convince her to go out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Relent and watch a movie with Katja':
 				cla

locations/katja_meynold_schedule.qsrc

@@ -382,12 +382,21 @@ else
 							end
 							locat['katja'] = locat['katja_save2']
 						end					
-					elseif minut < 45:
-						!!Dormroom - getting ready to go out
-						locat['katja']  = 35
 					else
-						!!Out -going to a party/bar/cafe
-						locat['katja']  = 37
+						if locat['katja_rand2'] ! daystart:
+							if minut < 45:
+								!!Dormroom - getting ready to go out
+								locat['katja']  = 35
+							else
+								!!Out -going to a party/bar/cafe
+								locat['katja']  = 37
+							end
+						else
+							if locat['katja_save2'] = 35 and minut >= 45:
+								locat['katja_save2'] = 37
+							end
+							locat['katja'] = locat['katja_save2']
+						end
 					end
 				end
 			elseif hour < 23:
@@ -404,6 +413,10 @@ else
 							!! Out nightclub
 							locat['katja'] = 53
 							locat['katja_save2'] = locat['katja']
+						elseif locat['katja_save2'] = 37:
+							!! Out nightclub
+							locat['katja'] = 53
+							locat['katja_save2'] = locat['katja']
 						else
 							locat['katja'] = locat['katja_save2']					
 						end
@@ -763,15 +776,22 @@ else
 					locat['katja']  = 34
 				end
 			elseif hour < 20:
-				if week < 4 or (week = 4 and university['exam_week'] = 1 and katjaQW['QWstage'] < 3 and katjaQW['liberated'] = 0):
-					!!Dormroom - relaxing/studying
-					locat['katja']  = 31
-				elseif minut < 45 and (week = 5 or university['exam_week'] = 1):
-					!!Dormroom - getting ready to go out
-					locat['katja']  = 35
+				if locat['katja_rand2'] ! daystart:
+					if week < 4 or (week = 4 and university['exam_week'] = 1):
+						!!Dormroom - relaxing/studying
+						locat['katja']  = 31
+					elseif minut < 45 and (week = 5 or university['exam_week'] = 1):
+						!!Dormroom - getting ready to go out
+						locat['katja']  = 35
+					else
+						!!Out -going to a party/bar/cafe
+						locat['katja']  = 37
+					end
 				else
-					!!Out -going to a party/bar/cafe
-					locat['katja']  = 37
+					if locat['katja_save2'] = 35 and minut >= 45:
+						locat['katja_save2'] = 37
+					end
+					locat['katja'] = locat['katja_save2']
 				end
 			elseif hour < 23:
 				if week < 4 or (week = 4 and university['exam_week'] = 1):
@@ -971,7 +991,7 @@ else
 						!!Train - traveling from Pav to the city.
 						locat['katja'] = 47
 					end
-				elseif hour < 23
+				elseif hour < 23:
 					if university['exam_week'] = 2:
 						!!In her room with not having visitors over
 						locat['katja'] = 9	
@@ -1182,12 +1202,21 @@ else
 							end
 							locat['katja'] = locat['katja_save2']
 						end					
-					elseif minut < 45:
-						!!Dormroom - getting ready to go out
-						locat['katja']  = 35
 					else
-						!!Out -going to a party/bar/cafe
-						locat['katja']  = 37
+						if locat['katja_rand2'] ! daystart:
+							if minut < 45:
+								!!Dormroom - getting ready to go out
+								locat['katja']  = 35
+							else
+								!!Out -going to a party/bar/cafe
+								locat['katja']  = 37
+							end
+						else
+							if locat['katja_save2'] = 35 and minut >= 45:
+								locat['katja_save2'] = 37
+							end
+							locat['katja'] = locat['katja_save2']
+						end			
 					end
 				end
 			elseif hour < 23:
@@ -1199,6 +1228,9 @@ else
 					elseif locat['katja_save2']  = 35:
 						locat['katja'] = 37
 						locat['katja_save2'] = locat['katja']
+					elseif locat['katja_save2']  = 37:
+						locat['katja'] = 53
+						locat['katja_save2'] = locat['katja']
 					else
 						locat['katja'] = locat['katja_save2']					
 					end
@@ -1213,7 +1245,7 @@ else
 							if katjaQW['QWstage'] < 3 and katjaQW['slut'] < 75 and katjaQW['liberated'] = 0:
 								locat['katja'] = func('shortgs', 'rand_pick', '', 29, 52)
 							else
-								locat['katja'] = func('shortgs', 'rand_pick', '', 37, 52, 52)
+								locat['katja'] = func('shortgs', 'rand_pick', '', 53, 52, 52)
 							end
 							locat['katja_rand2'] = daystart
 							locat['katja_save2'] = locat['katja']

locations/katja_party.qsrc

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

locations/katja_procedural.qsrc

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

locations/korrPar.qsrc

@@ -172,7 +172,7 @@ end
 $korrParMomHeader = '<center><h1><font color="maroon"><<$npc_nickname[''A29'']>></font></h1></center><center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center><br />'
 
 if hour >= 16 and hour <= 20 and locat['Fam_inGad'] = 0:
-	if artemvbrosvid = 1 and artemhakday ! daystart and npc_QW['A29'] < 2 and mothervideotalk = 0 or BrotherNo = 1 and BrotherNoDay ! daystart:
+	if artemvbrosvid = 1 and artemhakday ! daystart and npc_QW['A29'] < 2 and mothervideotalk = 0 or BrotherNo = 1 and BrotherNoDay ! daystart and BJvideoPublic = 0:
 		*clr & cla
 		menu_off = 1
 		BJvideoPublic = 1
@@ -231,7 +231,7 @@ if hour >= 16 and hour <= 20 and locat['Fam_inGad'] = 0:
 		exit
 	end
 
-	if artemvbrosvid=1 and artemhakday ! daystart and npc_QW['A29'] >= 2 and mothervideotalk = 0:
+	if artemvbrosvid=1 and artemhakday ! daystart and npc_QW['A29'] >= 2 and mothervideotalk = 0 and BJvideoPublic = 0:
 		*clr & cla
 		menu_off = 1
 		BJvideoPublic = 1

locations/kuhrPar.qsrc

@@ -71,8 +71,10 @@ elseif locat['Mother'] = 13:
 end
 if locat['Mother'] = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning.'
 
-if locat['Stepdad'] = 4: '<a href="exec:gt''father''">Your stepfather</a> is here reading the paper.'
-if locat['Stepdad'] = 7: '<a href="exec:gt''father''">Your stepfather</a> is here setting the table for dinner.'
+!! Clean up of code to ensure stepdad doesn''t warp you to the living room
+killvar '$kit_dad'
+if locat['Stepdad'] = 4: '<a href="exec:gt''father'',''kit''">Your stepfather</a> is here reading the paper.'
+if locat['Stepdad'] = 7: '<a href="exec:gt''father'',''kit''">Your stepfather</a> is here setting the table for dinner.'
 
 if week = 6 and locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0 and hour > 9 and hour < 12 and $home['current'] = 'parents_home':'Your parents are getting ready to go to <a href="exec:gt ''gadhouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'
 

locations/moncheri.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'gowns':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopmoncheri_gown_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopmoncheri_gown_filter'
 	end
 end
@@ -200,7 +200,7 @@ if $ARGS[0] = 'dresses':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopmoncheri_dress_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopmoncheri_dress_filter'
 	end
 end

locations/mother.qsrc

@@ -1789,6 +1789,7 @@ if $ARGS[0] = 'condom_find':
 	'As you''re in your room, <<$npc_nickname[''A29'']>> walks in and shuts the door behind her. Without saying a word she walks over to the desk, pulls out one of the draws and takes out some condoms, "<<$pcs_nickname>>, why do you have this in your desk?!"'
 	act 'I...':
 		*clr & cla
+		mom['condoms'] = 1
 		gs 'stat'
 		!! TEMPORARY PICTURE
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'

locations/npcgeneratec.qsrc

@@ -625,8 +625,8 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	!! npc_risktaker = 1: npc is more likely to take risks, such as never using a condom
 	if rand(0,2) > 0:
 		if rand(0,1) = 1:
-			npc_diligent[$npclastgenerated] = 1
-			npc_risktaker[$npclastgenerated] = 0
+			npc_diligent[$npclastgenerated] = 0
+			npc_risktaker[$npclastgenerated] = 1
 		else
 			npc_diligent[$npclastgenerated] = 1
 			npc_risktaker[$npclastgenerated] = 0
@@ -669,7 +669,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	
 !! ------------------------- sex related preferences ----------------------------------
 
-	if rand(0,1) >= 1 and npc_risktaker[$npclastgenerated] = 1:
+	if rand(0,1) >= 1 and npc_risktaker[$npclastgenerated] ! 1:
 !!		if npc_condom_conscious = 1: they will use condoms but can be talked out of it
 !!		if npc_condom_conscious = 2: they will always insist on using condoms unless you are in a committed relationship 
 		if npc_diligent[$npclastgenerated] = 1:

locations/npcpreservec.qsrc

@@ -121,6 +121,8 @@ if mid($npctemp,1,1) = 'C':
 	npc_latesleeper[$npclastsaved]	= npc_latesleeper[$npctemp]
 	npc_generous[$npclastsaved]		= npc_generous[$npctemp]
 	npc_selfish[$npclastsaved] 		= npc_selfish[$npctemp]
+	npc_risktaker[$npclastsaved] 	= npc_risktaker[$npctemp]
+	npc_diligent[$npclastsaved] 	= npc_diligent[$npctemp]
 	
 	npc_argumentative[$npclastsaved]	= npc_argumentative[$npctemp]
 	npc_competitive[$npclastsaved]		= npc_competitive[$npctemp]

locations/pav_park.qsrc

@@ -231,13 +231,15 @@ if $ARGS[0] = 'start':
 
 	gs 'music_actions', 'music_icon'
 
-	if month >= 6 and month <=8 and TourGuide = 0 and (work = 0 or cheatWork = 1):
-		if hour >= 8 and hour <= 18:
-			act 'Apply for the Tour Guide job (0:30)':gt 'tour_guide', 'tourstart'
-		end
-	elseif month >= 6 and month <=8 and emp_job_status[1] = 1 and (emp_job_status[1] ! 4 or emp_job_status[1] ! 5):
-		if hour >= 8 and hour <= 12:
-			act 'Work as Tour Guide (8:00)':gt 'tour_guide', 'tourstart'
+	if month >= 6 and month <=8:
+		if (emp_job_status[1] = 0  or emp_job_status[1] = 4) and (work = 0 or cheatWork = 1):
+			if hour >= 8 and hour <= 18:
+				act 'Apply for the Tour Guide job (0:30)':gt 'tour_guide', 'tourstart'
+			end
+		elseif emp_job_status[1] = 1:
+			if hour >= 8 and hour <= 12:
+				act 'Work as Tour Guide (8:00)':gt 'tour_guide', 'tourstart'
+			end
 		end
 	elseif emp_job_status[1] = 1:
 		!! out of season

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>'

locations/pav_train_market.qsrc

@@ -267,7 +267,7 @@ if $ARGS[0] = 'clo':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopmarket_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopmarket_outfits_filter'
 	end
 end

locations/pod_ezd.qsrc

@@ -294,11 +294,11 @@ if $ARGS[0] = 'roof':
 
 				if krem = 0:
 					pcs_tan += 1
-					'You lie down to sunbathe.'
+					'You lay down to sunbathe.'
 				elseif krem > 0:
 					krem -= 1
 					pcs_tan += 3
-					'You put the sunblock on your body and lied down on the roof to sunbathe.'
+					'You put the sunblock on your body and lay down on the roof to sunbathe.'
 				end
 
 				act 'Get Up':gt 'pod_ezd', 'roof'

locations/prostitution_functions.qsrc

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

locations/rasputin_host.qsrc

@@ -73,8 +73,8 @@ if $ARGS[0] = 'options':
 		'<center>Nadia Titova</center>'
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/rasputin/nadia_2.jpg"></center>'
 		'You ask Nadia about the shows Rasputin offers.'
-		'"We have the burlesque shows that starts at 6:30 and runs about 2 hours with an intermission."'
-		'"Then from 10:00 to midnight we have the exotic variety shows, you need to be at least 16 to see these shows."'
+		'"We have the burlesque shows that starts at 18:30 and runs about 2 hours with an intermission."'
+		'"Then from 22:00 to midnight we have the exotic variety shows, you need to be at least 16 to see these shows."'
 		'She finishes with a wink. You found yourself blushing pink for a moment.'
 
 		act	'Okay':
@@ -150,7 +150,7 @@ if $ARGS[0] = 'options':
 							*nl
 							gs 'stat'
 							'You hand her the cash for the burlesque show.'
-							'"Sure, the shows starts at 6:30 but we start to admit customers at 5:30."'
+							'"Sure, the shows starts at 18:30 but we start to admit customers at 17:30."'
 							'"Thank you!" Nadia smiles back as she hands you the ticket.'
 							minut += 1
 							money -= 3000
@@ -165,7 +165,7 @@ if $ARGS[0] = 'options':
 							*nl
 							gs 'stat'
 							'You hand her your credit card to be charged for the show.'
-							'"Sure, the shows starts at 6:30 but we start to admit customers at 5:30."'
+							'"Sure, the shows starts at 18:30 but we start to admit customers at 17:30."'
 							'"Thank you!" Nadia smiles back as she hands you the ticket.'
 							minut += 1
 							karta -= 3000
@@ -200,7 +200,7 @@ if $ARGS[0] = 'options':
 							*nl
 							gs 'stat'
 							'You hand her the cash to buy the ticket.'
-							'"Sure, the shows starts at 10:30 but we start to admit customers at 9:30."'
+							'"Sure, the shows starts at 22:30 but we start to admit customers at 21:30."'
 							'"Thank you!" Nadia smiles back as she hands you the ticket.'
 							minut += 1
 							money -= 4000
@@ -215,7 +215,7 @@ if $ARGS[0] = 'options':
 							*nl
 							gs 'stat'
 							'You hand her your credit card to be charged for the ticket.'
-							'"Sure, the shows starts at 10:30 but we start to admit customers at 9:30."'
+							'"Sure, the shows starts at 22:30 but we start to admit customers at 21:30."'
 							'"Thank you!" Nadia smiles back as she hands you the ticket.'
 							minut += 1
 							karta -= 4000
@@ -249,7 +249,7 @@ if $ARGS[0] = 'options':
 							*nl
 							gs 'stat'
 							'You hand her the cash to buy the ticket.'
-							'"Sure, the first show starts at 6:30 but we start to admit customers at 5:30."'
+							'"Sure, the first show starts at 18:30 but we start to admit customers at 17:30."'
 							'"Thank you!" Nadia smiles back as she hands you the ticket.'
 							minut += 1
 							money -= 7000
@@ -265,7 +265,7 @@ if $ARGS[0] = 'options':
 							*nl
 							gs 'stat'
 							'You hand her your credit card to be charged for the tickets.'
-							'"Sure, the shows starts at 6:30 but we start to admit customers at 5:30."'
+							'"Sure, the shows starts at 18:30 but we start to admit customers at 17:30."'
 							'"Thank you!" Nadia smiles back as she hands you the ticket.'
 							minut += 1
 							karta -= 7000

locations/salon.qsrc

@@ -2421,16 +2421,50 @@ if $ARGS[0] = 'cosmetic_tattoo_start':
 		else
 			epayments['value'] = 2000
 		end
-		$epayments['loc_arg'] = 'cosmetic_tattoo_operation'
-		$epayments['description'] = 'cosmetic tattoo operation'
 		
-		if bimbolevel > 0 or inhib_lvl >= 10:
-			if cosmetic_tattoo < 1: act 'Get light cosmetic tattoo':cosmetic_tattoo = 1 & gs 'shortgs', 'payments'
-			if cosmetic_tattoo < 2: act 'Get vibrant cosmetic tattoo':cosmetic_tattoo = 2 & gs 'shortgs', 'payments'
-			if cosmetic_tattoo < 3: act 'Get sultry cosmetic tattoo':cosmetic_tattoo = 3 & gs 'shortgs', 'payments'
-			if cosmetic_tattoo < 4: act 'Get professional cosmetic tattoo':cosmetic_tattoo = 4 & gs 'shortgs', 'payments'
-			if cosmetic_tattoo < 5: act 'Get celebrity(bimbo) cosmetic tattoo':cosmetic_tattoo = 5 & gs 'shortgs', 'payments'
-			if cosmetic_tattoo = 5: 'You already have the heaviest cosmetic tattoo that is on offer.'
+		if cosmetic_tattoo = 5:
+			'You already have the heaviest cosmetic tattoo that is on offer.'
+		elseif bimbolevel > 0 or inhib_lvl >= 10:
+			if cosmetic_tattoo < 1:
+				act 'Get light cosmetic tattoo':
+					$epayments['loc_arg'] = 'cosmetic_tattoo_operation'
+					$epayments['description'] = 'Light cosmetic tattoo'
+					temp_tattoo = 1
+					gs 'shortgs', 'payments'
+				end
+			end
+			if cosmetic_tattoo < 2:
+				act 'Get vibrant cosmetic tattoo':
+					$epayments['loc_arg'] = 'cosmetic_tattoo_operation'
+					$epayments['description'] = 'Vibrant cosmetic tattoo'
+					temp_tattoo = 2
+					gs 'shortgs', 'payments'
+				end
+			end
+			if cosmetic_tattoo < 3:
+				act 'Get sultry cosmetic tattoo':
+					$epayments['loc_arg'] = 'cosmetic_tattoo_operation'
+					$epayments['description'] = 'Sultry cosmetic tattoo'
+					temp_tattoo = 3
+					gs 'shortgs', 'payments'
+				end
+			end
+			if cosmetic_tattoo < 4:
+				act 'Get professional cosmetic tattoo':
+					$epayments['loc_arg'] = 'cosmetic_tattoo_operation'
+					$epayments['description'] = 'Professional cosmetic tattoo'
+					temp_tattoo = 4
+					gs 'shortgs', 'payments'
+				end
+			end
+			if cosmetic_tattoo < 5:
+				act 'Get celebrity(bimbo) cosmetic tattoo':
+					$epayments['loc_arg'] = 'cosmetic_tattoo_operation'
+					$epayments['description'] = 'Celebrity(bimbo) cosmetic tattoo'
+					temp_tattoo = 5
+					gs 'shortgs', 'payments'
+				end
+			end
 		else 
 			'<br>You dont feel confident enough to get one of these.'
 		end
@@ -2443,9 +2477,12 @@ end
 if $ARGS[0] = 'cosmetic_tattoo_operation':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/ct<<cosmetic_tattoo>>.jpg"></center>'
-	minut += 45
+	'The technician works away with the needle for 45 minutes until your <<$epayments[''description'']>> is completed.'
+	cosmetic_tattoo = temp_tattoo
+	killvar 'temp_tattoo'
+	minut += 45	
 	gs 'stat'
-	act 'End':gt 'salon', 'cosmetic_tattoo_start'
+	act 'Continue':gt 'salon', 'services'
 end
 
 if $ARGS[0] = 'mom':

locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 9
 version_revision = 0
-version_patch = 0
+version_patch = 1
 --- saveg ---------------------------------
 

locations/sex_ev_after.qsrc

@@ -1330,6 +1330,8 @@ if $ARGS[0] = 'after_sex_dressed':
 	else
 	
 	end
+	act'Use the bathroom':gt'sex_ev_after', 'boy_bathroom'
+	
 	gs'sex_ev_leave', 'breakup_start'
 !!{
 	
@@ -1348,10 +1350,12 @@ if $ARGS[0] = 'boy_bathroom':
 	cla & *clr
 	$sex_ev['bath_room']
 	act'Back to the bedroom':
-		if sex_ev['morning_after'] = 0:
+		if sex_ev['dressed_to_go'] = 1:
+			gt 'sex_ev_after', 'after_sex_dressed'
+		elseif sex_ev['morning_after'] = 0:
 			gt 'sex_ev_after', 'after_sex2_w_picture'
 		else
-			gt 'sex_ev_morning', 'wakeup2'
+			gt 'sex_ev_morning', 'morning_menu2'
 		end
 	end
 	act'Use the mirror':

locations/sex_ev_cum.qsrc

@@ -289,7 +289,7 @@ if $ARGS[0] = 'fuck_cum_random':
 		if $sex_ev['cum_choice'] = 'creampie' and ((npc_free_creampies[$boy] = 1 and (sex_ev['safe_day'] = 1 or sex_ev['probably_safe_day'] = 1)) or npc_free_creampies[$boy] = 2 or sex_ev['creampie_allowance'] = 1):
 			sex_ev['cum_warn'] = 0
 			$sex_ev['cum_choice'] = 'creampie_surprise'
-		elseif sex_ev['no_condom'] ! 1 and $sex_ev['cum_choice'] = 'creampie':
+		elseif sex_ev['no_condom'] = 1 and $sex_ev['cum_choice'] = 'creampie':
 			sex_ev['cum_warn'] = 1
 			$sex_ev['cum_choice'] = ''
 		end
@@ -587,6 +587,8 @@ if $ARGS[0] = 'fuck_cum':
 !!		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
 	elseif sex_ev['boy_cum'] < 1:
 		gs'sex_ev_cum', 'girl_cum'
+	elseif sex_ev['boy_cum'] > 0:
+		act'Continue':gt 'sex_ev_cum', 'cum_his_choice2'
 	end
 end
 

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

locations/sex_ev_leave.qsrc

@@ -920,10 +920,12 @@ end
 if $ARGS[0] = 'dressing_finish':
 !!	if sex_ev['dress_end'] ! 1:
 	act'Finish getting dressed':
+		sex_ev['dressed_to_go'] = 1
 		cla & *clr
 	!!			$sex_ev['bed_room']
 		gs'sex_ev_leave', 'dress_loop'
 		'You finish <<$sex_ev[''dress_describe'']>>.'
+		gs'sex_ev_leave', 'dress_loop_end'
 		gs'sex_ev_after', 'after_sex_dressed'
 	end
 end
@@ -1479,6 +1481,17 @@ if $ARGS[0] = 'dress_loop':
 	gs'stat'
 end
 
+
+if $ARGS[0] = 'dress_loop_end':
+	!! this forces the player to get fully dressed
+	gs'sex_ev_leave', 'dress_loop_code'
+	if sex_ev['dress_end'] ! 1:
+		gs'sex_ev_leave', 'dress_loop_end'
+	else
+		gs'stat'
+	end
+end
+
 if $ARGS[0] = 'dress_loop_code':
 	:dress_loop_start
 	if sex_ev['dressing_start'] ! 1:

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

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
@@ -321,28 +321,28 @@ if $ARGS[0] = 'fuck_continue':
 		elseif sex_ev['fuck_enjoyment'] = -1:
 			$orgasm_or = 'no'
 			if sex_ev['speed'] = 3:
-				act'Sob':sex_ev['fuck_pain'] = 4 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
-				act'Try to hold back tears':sex_ev['fuck_pain'] = 3 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
+				act'Sob':sex_ev['fuck_pain'] = 4 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
+				act'Try to hold back tears':sex_ev['fuck_pain'] = 3 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			else
-				act'Hold back tears':sex_ev['fuck_pain'] = 3 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
+				act'Hold back tears':sex_ev['fuck_pain'] = 3 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			end
-			act'Perservere':sex_ev['fuck_pain'] = 2 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
-			act'The pain is fading':sex_ev['fuck_pain'] = 1 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
+			act'Perservere':sex_ev['fuck_pain'] = 2 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
+			act'The pain is fading':sex_ev['fuck_pain'] = 1 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 		elseif sex_ev['fuck_enjoyment'] = 0:
 			$orgasm_or = 'no'
-			act'Just keep fucking':sex_ev['moan'] = 1 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
-			act'Fake some moans':sex_ev['moan'] = 2 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
-			act'Starting to feel good':sex_ev['fuck_pain'] = -1 & $orgasm_or = '' & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
+			act'Just keep fucking':sex_ev['moan'] = 1 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
+			act'Fake some moans':sex_ev['moan'] = 2 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
+			act'Starting to feel good':sex_ev['fuck_pain'] = -1 & $orgasm_or = '' & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 		else
-			act'Focus on the sensations':$orgasm_or = '' & sex_ev['dirty_talk'] = 0 & sex_ev['moan'] = 0 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
-			act'Moan softly':$orgasm_or = '' & sex_ev['dirty_talk'] = 0 & sex_ev['moan'] = 1 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
-			act'Moan loudly':$orgasm_or = '' & sex_ev['dirty_talk'] = 0 & sex_ev['moan'] = 2 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
+			act'Focus on the sensations':$orgasm_or = '' & sex_ev['dirty_talk'] = 0 & sex_ev['moan'] = 0 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
+			act'Moan softly':$orgasm_or = '' & sex_ev['dirty_talk'] = 0 & sex_ev['moan'] = 1 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
+			act'Moan loudly':$orgasm_or = '' & sex_ev['dirty_talk'] = 0 & sex_ev['moan'] = 2 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 	!!		act'Dirty talk...':gs 'sex_ev_sex', 'dirty_talk1'
 			act'Dirty talk':
 				$orgasm_or = ''
 				sex_ev['moan'] = 0
 				sex_ev['dirty_talk'] = 1
-				gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
+				gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			end
 !!{			if $sex_ev['speed'] ! 3:
 				act'Talk while fucking':
@@ -355,7 +355,7 @@ if $ARGS[0] = 'fuck_continue':
 				end
 			end}
 			if sex_ev['fuck_enjoyment'] ! 2:
-				act'Fake enjoyment':sex_ev['bored'] = 1 & sex_ev['moan'] = 3 & $orgasm_or = 'no' & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
+				act'Fake enjoyment':sex_ev['bored'] = 1 & sex_ev['moan'] = 3 & $orgasm_or = 'no' & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			end
 		end
 		
@@ -548,7 +548,7 @@ if $ARGS[0] = 'dirty_talk2':
 	$orgasm_or = ''
 	sex_ev['moan'] = 0
 	sex_ev['dirty_talk'] = 1
-	gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
+	gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 end
 
 

locations/sexshop.qsrc

@@ -218,7 +218,7 @@ if $ARGS[0] = 'dress':
 
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_dress''"><img <<$set_imgh>> src="images/pc/items/eroto/dress/<<i>>.jpg"	height="250" /></a>'
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_dress''"><img src="images/pc/items/eroto/dress/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 2
@@ -227,7 +227,7 @@ if $ARGS[0] = 'dress':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'looperoto_dress_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'looperoto_dress_filter'
 	end
 end
@@ -266,7 +266,7 @@ if $ARGS[0] = 'outfits':
 
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_outfits''"><img <<$set_imgh>> src="images/pc/items/eroto/outfits/<<i>>.jpg"	height="250" /></a>'
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_outfits''"><img src="images/pc/items/eroto/outfits/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 2
@@ -275,7 +275,7 @@ if $ARGS[0] = 'outfits':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'looperoto_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'looperoto_outfits_filter'
 	end
 end
@@ -310,7 +310,7 @@ if $ARGS[0] = 'strip':
 
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_strip''"><img <<$set_imgh>> src="images/pc/items/eroto/strip/<<i>>.jpg"	height="250" /></a>'
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_strip''"><img src="images/pc/items/eroto/strip/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 1
@@ -319,7 +319,7 @@ if $ARGS[0] = 'strip':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'looperoto_strip_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'looperoto_strip_filter'
 	end
 end

locations/shoes.qsrc

@@ -392,7 +392,7 @@ if $ARGS[0] = 'wear':
 	end
 
 	if $shoeworntype = 'none':
-		PShoQuaility = 0
+		PShoQuality = 0
 		PShoCut = 0
 		PShoHeels = 0
 		PShoStyle = 0

locations/shop.qsrc

@@ -18,6 +18,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = 'move': minut += 1
 
 !! Main area
 if $shoplocation = 'main':
+	if $loc = 'shop': $loc = $loc_bak
 	*clr & cla
 	'<center><b><font color="maroon">Supermarket</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/store/shop.jpg"></center>'

locations/shop_allure.qsrc

@@ -88,7 +88,7 @@ if $ARGS[0] = 'swim':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopallure_swimsuit_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopallure_swimsuit_filter'
 	end
 end
@@ -139,7 +139,7 @@ if $ARGS[0] = 'bikinis':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopallure_bikinis_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopallure_bikinis_filter'
 	end
 end

locations/shop_coco_carmen.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'dress':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopcoco_dress_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopcoco_dress_filter'
 	end
 end
@@ -129,7 +129,7 @@ if $ARGS[0] = 'outfits':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopcoco_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopcoco_outfits_filter'
 	end
 end

locations/shop_dolls.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'dress':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopdolls_dress_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopdolls_dress_filter'
 	end
 end
@@ -177,7 +177,7 @@ if $ARGS[0] = 'clothing':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopdolls_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopdolls_filter'
 	end
 end

locations/shop_fancy_pancy.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'clothes':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopfancy_burlesque_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopfancy_burlesque_filter'
 	end
 end

locations/shop_fashionista.qsrc

@@ -173,7 +173,7 @@ if $ARGS[0] = 'dressingclothes':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopfashionista_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopfashionista_filter'
 	end
 end
@@ -230,7 +230,7 @@ if $ARGS[0] = 'dressingoutfit':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopfashionista_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopfashionista_outfits_filter'
 	end
 end

locations/shop_flamingos.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'dresses':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopflamingos_dress_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopflamingos_dress_filter'
 	end
 end
@@ -126,7 +126,7 @@ if $ARGS[0] = 'clothes':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopflamingos_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopflamingos_filter'
 	end
 end

locations/shop_materinstvo.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'clothes':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopmaterinstvo_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopmaterinstvo_filter'
 	end
 end

locations/shop_nerdvana.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'cosplay':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopnerdvana_cosplay_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopnerdvana_cosplay_filter'
 	end
 end
@@ -128,7 +128,7 @@ if $ARGS[0] = 'outfits':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopnerdvana_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopnerdvana_outfits_filter'
 	end
 end
@@ -179,7 +179,7 @@ if $ARGS[0] = 'swim':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopnerdvana_swimsuit_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopnerdvana_swimsuit_filter'
 	end
 end
@@ -220,7 +220,7 @@ if $ARGS[0] = 'bikinis':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopnerdvana_bikinis_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopnerdvana_bikinis_filter'
 	end
 end

locations/shop_pussycats.qsrc

@@ -1072,7 +1072,7 @@ if $ARGS[0] = 'dress':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopcats_dress_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopcats_dress_filter'
 	end
 end
@@ -1123,7 +1123,7 @@ if $ARGS[0] = 'clothes':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopcats_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopcats_outfits_filter'
 	end
 end

locations/shop_scandalicious.qsrc

@@ -97,7 +97,7 @@ if $ARGS[0] = 'clothes':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopscandalicious_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopscandalicious_outfits_filter'
 	end
 end
@@ -160,7 +160,7 @@ if $ARGS[0] = 'dresses':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopscandalicious_dress_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopscandalicious_dress_filter'
 	end
 end

locations/shop_tsar_bomba.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'dresses':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopbomba_dresses_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopbomba_dresses_filter'
 	end
 end
@@ -129,7 +129,7 @@ if $ARGS[0] = 'clothes':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopbomba_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopbomba_filter'
 	end
 end

locations/soniahome.qsrc

@@ -13,16 +13,11 @@
 !! soniaQW['vitek_bj_watched'] = 1 - means you watched Sonia give Vitek a blowjob at the disco
 
 if $ARGS[0] = 'home':
-	$menu_loc = 'soniahome'
-	$menu_arg = 'home'
 	menu_off = 0
 	$track_loop = ''
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$locM_arg = 'home'
-	$locM = 'soniahome'
-	$loc_arg = 'home'
-	$loc = 'soniahome'
+	gs 'shortgs', 'setloc', 'soniahome', $ARGS[0]
 	$location_type = 'private'
 	*clr & cla
 	gs 'stat'
@@ -100,10 +95,7 @@ if $ARGS[0] = 'home':
 end
 
 if $ARGS[0] = 'hallway':	
-	$loc = 'soniahome'
-	$loc_arg = 'hallway'
-	$locM_arg = 'hallway'
-	$locM = 'soniahome'
+	gs 'shortgs', 'setloc', 'soniahome', $ARGS[0]
 	$location_type = 'private'
 	$menu_arg = $ARGS[0]
 	menu_off = 0
@@ -114,18 +106,17 @@ if $ARGS[0] = 'hallway':
 	'<center><b><font color = maroon>Hallway</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/hall.jpg"></center>'
 	'You enter a small bright hallway with a door to the lounge on your right and a staircase at the end leading to the bedrooms and bathroom upstairs. There''s also a door to the kitchen in front of you.'
+	act 'Leave': gt 'pav_residential'
 	act 'Go to Sonia''s bedroom': gt 'soniahome','sonia_room'
-	act 'Go to the bathroom': gt 'soniahome','bathroom'
-	act 'Go to the kitchen': gt 'soniahome','kitchen'
-	act 'Living Room': gt 'soniahome','livingroom'
 	act 'Brother''s Room': gt 'soniahome','soniabrother'
 	act 'Parents Room': gt 'soniahome','soniaparents'
-	act 'Leave': gt 'pav_residential'
+	act 'Living Room': gt 'soniahome','livingroom'
+	act 'Go to the bathroom': gt 'soniahome','bathroom'
+	act 'Go to the kitchen': gt 'soniahome','kitchen'
 end
 
 if $ARGS[0] = 'bathroom':
-	$loc = 'soniahome'
-	$loc_arg = 'bathroom'
+	gs 'shortgs', 'setloc', 'soniahome', $ARGS[0]
 	$location_type = 'bathroom'
 	$menu_arg = $ARGS[0]
 	menu_off = 0
@@ -161,10 +152,7 @@ if $ARGS[0] = 'bathroom':
 end
 
 if $ARGS[0] = 'kitchen':
-	$loc = 'soniahome'
-	$loc_arg = 'kitchen'
-	$locM_arg = 'kitchen'
-	$locM = 'soniahome'
+	gs 'shortgs', 'setloc', 'soniahome', $ARGS[0]
 	$menu_arg = $ARGS[0]
 	menu_off = 0
 	*clr & cla
@@ -310,12 +298,7 @@ if $ARGS[0] = 'fridge':
 end
 
 if $ARGS[0] = 'livingroom':
-	$loc = 'soniahome'
-	$loc_arg = 'livingroom'
-	$menu_loc = 'soniahome'
-	$menu_arg = 'livingroom'
-	$locM = 'soniahome'	
-	$locM_arg = 'livingroom'
+	gs 'shortgs', 'setloc', 'soniahome', $ARGS[0]
 
 	menu_off = 0
 	CLOSE ALL
@@ -335,12 +318,7 @@ if $ARGS[0] = 'livingroom':
 end
 
 if $ARGS[0] = 'soniaparents':	
-	$loc = 'soniahome'	
-	$loc_arg = 'soniaparents'
-	$menu_loc = 'soniahome'
-	$menu_arg = 'soniaparents'
-	$locM_arg = 'soniaparents'
-	$locM = 'soniahome'
+	gs 'shortgs', 'setloc', 'soniahome', $ARGS[0]
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
@@ -373,12 +351,7 @@ if $ARGS[0] = 'soniaparents':
 end
 
 if $ARGS[0] = 'soniabrother':	
-	$loc = 'soniahome'	
-	$loc_arg = 'soniabrother'
-	$menu_loc = 'soniahome'
-	$menu_arg = 'soniabrother'
-	$locM = 'soniahome'
-	$locM_arg = 'soniabrother'
+	gs 'shortgs', 'setloc', 'soniahome', $ARGS[0]
 
 	menu_off = 0
 	CLOSE ALL
@@ -392,11 +365,7 @@ if $ARGS[0] = 'soniabrother':
 end
 
 if $ARGS[0] = 'sonia_room':
-	$loc = 'soniahome'
-	$loc_arg = 'sonia_room'
-	$locM = 'soniahome'
-	$locM_arg = 'sonia_room'
-	$locclass = 'bedr'
+	gs 'shortgs', 'setloc', 'soniahome', $ARGS[0]
 	$menu_arg = $ARGS[0]
 	menu_off = 0
 	*clr & cla

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
 
@@ -107,7 +95,7 @@ if $ARGS[0] = 'clo':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopdanilovich_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopdanilovich_outfits_filter'
 	end
 end
@@ -202,7 +190,7 @@ if $ARGS[0] = 'swim':
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
 		jump 'loopswim_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 		jump 'loopswim_filter'
 	end
 end

locations/start.qsrc

@@ -18,7 +18,7 @@ $fname = 'Tahoma'
 fsize = 12
 gs 'saveg'
 gs 'addbuilddate'
-$version = '<<version_major>>.<<version_minor>>.<<version_revision>>.<<version_patch>> built on <<$builddate>> for the so late I should have called it the 0.9.5 version'
+$version = '<<version_major>>.<<version_minor>>.<<version_revision>>.<<version_patch>> built on <<$builddate>> for the 10 days late even with the extra month version'
 opPRE = 1
 
 *nl

locations/stat.qsrc

@@ -87,10 +87,6 @@ end
 if lernSkill >= 8: gs 'exp_gain', 'intel', 1 & lernSkill = 0
 if lern >= 10: gs 'exp_gain', 'intel', 1 & lern = 0
 
-!! Katja learning about you sexual experience from other sources because you are a slut.
-if fame['pav_slut'] >= 150 and stat['bj'] > 0 and katjaQW['knows_BJ'] ! 1: katjaQW['knows_BJ'] = 1
-if fame['pav_slut'] >= 250 or preg > 0 and stat['vaginal'] > 0 and katjaQW['knows_sex'] ! 1: katjaQW['knows_sex'] = 1
-
 shameless = guy + stat['bj'] + stat['anal'] + stat['hj'] + ((slutty + gang) * 2)
 moneySUM = money + karta + stolmoney
 cumSUM = cumsumbod/40
@@ -195,7 +191,7 @@ elseif pcs_inhib > 100:
 end
 
 healthmax = (pcs_vital * 10 + pcs_stren * 5)
-stammax = 5 * (2 * pcs_vital + pcs_agil + pcs_stren) / 2
+stammax = (30* (2 * pcs_vital + pcs_agil + pcs_stren) +1000)/ 13
 speed = (2 * (pcs_stren + pcs_agil) + pcs_vital) / 5
 if healthmax < 1: healthmax = 1
 if willpowermax < 50: willpowermax = 50
@@ -454,7 +450,7 @@ if minut >= 60:
 			pcs_energy -= (4 * amphetamineBonus + succublvl/2)
 			pcs_hydra -= (8 * amphetamineBonus + succublvl/2)
 		end
-		pcs_stam += stammax / 10
+		pcs_stam += stammax / 8
 		pcs_sleep -= 4
 		if alko > 0: alko -= 1
 		pcs_willpower_feeder += willpowermax*4
@@ -468,7 +464,6 @@ if minut >= 60:
 			pcs_energy -= (8 * amphetamineBonus + succublvl)
 			pcs_hydra -= (16 * amphetamineBonus + succublvl)
 		end
-		pcs_stam += stammax / 20
 		if InSleepWake <= hour or InSleepWake[1] < daystart:
 			pcs_sleep -= 4
 		end
@@ -497,6 +492,13 @@ if minut >= 60:
 		else
 			pcs_mood['hydredcheck'] = 0
 		end
+		if pcs_stam <= 0:
+			pcs_mood -= 6
+			pcs_sleep -= 5
+		elseif pcs_stam < stammax / 5:
+			pcs_mood -= 3
+		end
+		pcs_stam += stammax / 40
 		pcs_willpower_feeder += willpowermax*4/3
 		pcs_willpwr += pcs_willpower_feeder/100
 		pcs_willpower_feeder = pcs_willpower_feeder mod 100
@@ -662,9 +664,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
 
@@ -694,6 +696,8 @@ if minut >= 60:
 
 	gs 'traits', 'hourly'
 
+	gs 'katja_procedural', 'hourly'
+
 	if (hour mod 2) = 0: gs 'outdoors', 'weather'
 
 	!! I do not think that this should be here, but I put it here temporaly - rachels

locations/stat_display.qsrc

@@ -445,83 +445,28 @@ $stat_bra_msg = ''
 $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':
-			$stat_bra_msg = 'Your bra is clearly showing through your transparent top.'
-			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
+	if PCloThinness = 6 and $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>'
+	elseif PCloThinness = 5 and $braworntype ! 'none':
+		if PCloDress = 1:
+			$stat_bra_msg = 'The outline of your bra is visible through your dress.'
+			$stat_bra_text = '<BR><font color = #0064FF><<$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>'
+			$stat_bra_msg = 'Your outline of your bra is visible through your top.'
+			$stat_bra_text = '<BR><font color = #0064FF><<$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 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>'
-			else
-				$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.'
-				$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_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-			end
+	elseif CloTopCut = 4 and $braworntype ! 'none':
+		if PCloDress = 1:
+			$stat_bra_msg = 'Parts of your bra are visible due to your dress''s cut.'
+			$stat_bra_text = '<BR><font color = #0064FF><<$stat_bra_msg>></font>'
+		else
+			$stat_bra_msg = 'Parts of your bra are visible due to your top''s cut.'
+			$stat_bra_text = '<BR><font color = #0064FF><<$stat_bra_msg>></font>'
 		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 CloTopCut = 3 and $braworntype ! 'none':
+		$stat_bra_msg = 'Some glimpses of your bra are visible due to your plunging neckline.'
+		$stat_bra_text = '<BR><font color = #0064FF><<$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>'
@@ -530,110 +475,220 @@ 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 PCloCoverTop = 4:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are completely exposed.'
+		$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
+	elseif PCloCoverTop = 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 PCloCoverTop = 2:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are visible through your clothing.'
+		$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
+	elseif PCloCoverTop = 1:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are barely visible through your clothing.'
+		$stat_bra_text = '<BR><font color = #0064FF><<$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.'
+if $clothingworntype ! 'nude':
+	if PCloThinness = 6:
+		if $pantyworntype ! 'none':
+			if PCloSkirt = 6:
+				$stat_panty_msg = 'Your dress is so short that your panties clearly visible.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			elseif PCloSkirt = 5:
+				if PCloDress = 1:
+					$stat_panty_msg = 'Your dress is short and transparent so anyone can see your panties.'
+					$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+				else
+					$stat_panty_msg = 'Your skirt is short and transparent so anyone can see your panties.'
+					$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+				end
+			elseif 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 PCloSkirt = 6:
+				if PCloDress = 1:
+					$stat_panty_msg = 'Your dress is so short that your panties clearly visible.'
+					$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+				else
+					$stat_panty_msg = 'Your skirt is so short that your panties clearly visible.'
+					$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+				end
+			elseif PCloSkirt = 5:
+				if PCloDress = 1:
+					$stat_panty_msg = 'The outline of your panties can be seen and often exposed by your short dress.'
+					$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+				else
+					$stat_panty_msg = 'The outline of your panties can be seen and often exposed by your short skirt.'
+					$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+				end
+			elseif PCloDress = 1:
+				$stat_panty_msg = 'The outline of your panties is visible through your dress.'
+				$stat_panty_text = '<BR><font color = #0064FF><<$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 = #0064FF><<$stat_panty_msg>></font>'
+			else
+				if PCloPants = 6:
+					$stat_panty_msg = 'Your short shorts expose your panties and are so thin the outline of the rest of your panties can be seen.'
+					$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+				else
+					$stat_panty_msg = 'The outline of your panties is visible through your pants.'
+					$stat_panty_text = '<BR><font color = #0064FF><<$stat_panty_msg>></font>'
+				end
+			end
+		end
+	elseif PCloSkirt = 6:
+		$stat_panty_msg = 'Your dress is so short that your panties clearly visible.'
+		$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+	elseif PCloSkirt = 5:
+		$stat_panty_msg = 'Your dress is short and your panties can often be seen.'
 		$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.'
+	elseif PCloSkirt = 4:
+		$stat_panty_msg = 'Your dress is short enough that and your panties can be seen when you bend over.'
+		$stat_panty_text = '<BR><font color = #0064FF><<$stat_panty_msg>></font>'
+	elseif PCloPants = 6:
+		$stat_panty_msg = 'Your short shorts expose your panties.'
+		$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+	end
+
+	if PCloPanties = 1:
+		$stat_panty_msg = 'Your outfit is replacing your panties.'
+		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+	elseif $pantyworntype = 'none':
+		if pcs_inhib < 30:
+			$stat_panty_msg = 'You are not wearing panties.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif pcs_inhib < 70:
+			$stat_panty_msg = 'You are not wearing panties.'
+			$stat_panty_text = '<BR><font color = #0064FF><<$stat_panty_msg>></font>'
 		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.'
+			$stat_panty_msg = 'You are not wearing panties.'
+			$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
 		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.'
-		$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.'
-		$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 PCloCoverBack = 4:
+		if PCloCoverFront = 4:
+			$stat_panty_msg = 'Your pussy and butt are completely exposed.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif PCloCoverFront = 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 PCloCoverFront = 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 PCloCoverFront = 1:
+			$stat_panty_msg = 'Your pussy is barely visible and your butt completely exposed through your clothing.'
+			$stat_panty_text = '<BR><font color = #0064FF><<$stat_panty_msg>></font>'
+		end
+	elseif PCloCoverBack = 3:
+		if PCloCoverFront = 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 PCloCoverFront = 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 PCloCoverFront = 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 PCloCoverFront = 1:
+			$stat_panty_msg = 'Your pussy is barely visible and your butt clearly visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #0064FF><<$stat_panty_msg>></font>'
+		end
+	elseif PCloCoverBack = 2:
+		if PCloCoverFront = 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 PCloCoverFront = 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 PCloCoverFront = 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 PCloCoverFront = 1:
+			$stat_panty_msg = 'Your pussy is barely visible and your butt visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #0064FF><<$stat_panty_msg>></font>'
+		end
+	elseif PCloCoverBack = 1:
+		if PCloCoverFront = 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 PCloCoverFront = 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 PCloCoverFront = 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 PCloCoverFront = 1:
+			$stat_panty_msg = 'Your pussy and your butt are barely visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #0064FF><<$stat_panty_msg>></font>'
+		end
+	end
 end
 
 $stat_clothes_msg = ''
 $stat_clothes_text = ''
 
 if $clothingworntype = 'nude':
-	if $pantyworntype = 'salacious':
+	if PanThinness >= 5:
 		if $braworntype = 'none':
 			$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.'
 		else
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through panties and bra.</font>'
-			$stat_clothes_tooltip = 'You are wearing your see-through panties and bra.'
-			$stat_clothes_msg = 'You are only wearing your see-through panties and bra.'
+			$stat_clothes_tooltip = 'You are wearing your see-through panties and a regular bra.'
+			$stat_clothes_msg = 'You are only wearing your see-through panties and a regular bra.'
 		end
 	elseif $pantyworntype ! 'none':
 		if $braworntype = 'none':
 			$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.'

locations/telefon.qsrc

@@ -771,7 +771,13 @@ if $ARGS[0] = 'mobilaraz':
 			if willAgree:
 				'<<$telsob>>, "See you in the park in an hour."'
 
-				act 'Go':gt 'parksvid'
+				act 'Go':
+					if $clothingworntype = 'nude':
+						gs 'clothing','wear_last_worn'
+						gs 'underwear','wear'
+					end
+					gt 'parksvid'
+				end
 			else
 				gs 'telefon','telotkaz',$telsob
 			end
@@ -797,7 +803,13 @@ if $ARGS[0] = 'mobilaraz':
 		if willAgree:
 			'<<$telsob>>, "See you at the pool hall in an hour."'
 
-			act 'Go':gt 'billsvid'
+			act 'Go':
+				if $clothingworntype = 'nude':
+					gs 'clothing','wear_last_worn'
+					gs 'underwear','wear'
+				end
+				gt 'billsvid'
+			end
 		else
 			gs 'telefon','telotkaz',$telsob
 		end
@@ -810,7 +822,13 @@ if $ARGS[0] = 'mobilaraz':
 		if willAgree:
 			'<<$telsob>>, "See you at the cafe in an hour."'
 
-			act 'Go':gt 'kafesvid'
+			act 'Go':
+				if $clothingworntype = 'nude':
+					gs 'clothing','wear_last_worn'
+					gs 'underwear','wear'
+				end
+				gt 'kafesvid'
+			end
 		else
 			gs 'telefon','telotkaz',$telsob
 		end
@@ -823,7 +841,13 @@ if $ARGS[0] = 'mobilaraz':
 		if willAgree:
 			'<<$telsob>>, "See you in the casino in an hour."'
 
-			act 'Go':gt 'kazinosvid'
+			act 'Go':
+				if $clothingworntype = 'nude':
+					gs 'clothing','wear_last_worn'
+					gs 'underwear','wear'
+				end
+				gt 'kazinosvid'
+			end
 		else
 			gs 'telefon','telotkaz',$telsob
 		end
@@ -858,7 +882,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 			if willAgree:
 				'<<$telsob>>, "See you in the park in an hour."'
 
-				act 'Go': gt 'parksvid'
+				act 'Go':
+					if $clothingworntype = 'nude':
+						gs 'clothing','wear_last_worn'
+						gs 'underwear','wear'
+					end
+					gt 'parksvid'
+				end
 			else
 				gs 'telefon','telotkaz',$telsob
 			end
@@ -871,7 +901,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 
 		if willAgree:
 			'<<$telsob>>, "See you at the movie theater in an hour."'
-			act 'Go': gt 'kinosvid'
+			act 'Go':
+				if $clothingworntype = 'nude':
+					gs 'clothing','wear_last_worn'
+					gs 'underwear','wear'
+				end
+				gt 'kinosvid'
+			end
 		else
 			gs 'telefon','telotkaz',$telsob
 		end
@@ -885,7 +921,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 			if willAgree:
 				'<<$telsob>>, "See you at the pool hall in an hour."'
 
-				act 'Go': gt 'billsvid'
+				act 'Go':
+					if $clothingworntype = 'nude':
+						gs 'clothing','wear_last_worn'
+						gs 'underwear','wear'
+					end
+					gt 'billsvid'
+				end
 			else
 				gs 'telefon','telotkaz',$telsob
 			end
@@ -899,7 +941,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 		if willAgree:
 			'<<$telsob>>, "See you at the cafe in an hour."'
 
-			act 'Go': gt 'kafesvid'
+			act 'Go':
+				if $clothingworntype = 'nude':
+					gs 'clothing','wear_last_worn'
+					gs 'underwear','wear'
+				end
+				gt 'kafesvid'
+			end
 		else
 			gs 'telefon','telotkaz',$telsob
 		end
@@ -912,7 +960,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 		if willAgree:
 			'<<$telsob>>, "See you in the casino in an hour."'
 
-			act 'Go': gt 'kazinosvid'
+			act 'Go':
+				if $clothingworntype = 'nude':
+					gs 'clothing','wear_last_worn'
+					gs 'underwear','wear'
+				end
+				gt 'kazinosvid'
+			end
 		else
 			gs 'telefon','telotkaz',$telsob
 		end
@@ -949,7 +1003,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 0:
 			if willAgree:
 				'<<$loverdesc[lover_number]>>, "See you in the park in an hour."'
 
-				act 'Go':gt 'svidboy', 'parksvid'
+				act 'Go':
+					if $clothingworntype = 'nude':
+						gs 'clothing','wear_last_worn'
+						gs 'underwear','wear'
+					end
+					gt 'svidboy', 'parksvid'
+				end
 			else
 				gs 'telefon','telotkaz',$loverdesc[lover_number]
 			end
@@ -963,7 +1023,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 0:
 		if willAgree:
 			'<<$loverdesc[lover_number]>>, "See you at the movie theater in an hour."'
 
-			act 'Go':gt 'svidboy', 'kinosvid'
+			act 'Go':
+				if $clothingworntype = 'nude':
+					gs 'clothing','wear_last_worn'
+					gs 'underwear','wear'
+				end
+				gt 'svidboy', 'kinosvid'
+			end
 		else
 			gs 'telefon','telotkaz',$loverdesc[lover_number]
 		end
@@ -991,7 +1057,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 0:
 		if willAgree:
 			'<<$loverdesc[lover_number]>>, "See you at the cafe in an hour."'
 
-			act 'Go':gt 'svidboy', 'kafesvid'
+			act 'Go':
+				if $clothingworntype = 'nude':
+					gs 'clothing','wear_last_worn'
+					gs 'underwear','wear'
+				end
+				gt 'svidboy', 'kafesvid'
+			end
 		else
 			gs 'telefon','telotkaz',$loverdesc[lover_number]
 		end

locations/tour_guide.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'tourstart':
 	menu_off = 1
 	cla & *clr
 	!! TourGuide = 0
-	if (emp_job_status[1] = 0  or emp_job_status[1] =4) and emp_job_status[1] ! 5:
+	if emp_job_status[1] = 0  or emp_job_status[1] =4:
 		minut += 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/palace/office/tour_office.jpg"></center>'
@@ -80,12 +80,11 @@ if $ARGS[0] = 'tourran2':
 	*nl
 	'Should you suggest slipping away for a swim or just try and finish the tour quickly so they can get to the beach sooner and let you get back to work?'
 	if pcs_horny >= 40:
-		gs 'willpower', 'easy'
+		gs 'willpower', 'misc', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Slip away to the beach (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'easy'
-				gs 'willpower', 'pay'
+				gs 'willpower', 'pay', 'self'
 				gs 'exp_gain', 'persuas', rand(1,2)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.jpg"></center>'

locations/traits.qsrc

@@ -224,11 +224,16 @@ if $ARGS[0] = 'overnight':
 	
 	!! The effect of homework on the nerd trait is handle along with the grade calculations in gschool.qsrc
 	if kanikuli = 0 and week = 6:
-		!!This check has to be changed if the number of non-sport lessons ever changes (27 right now)
-		if pcs_traits['nerd_lessons'] > 20:
-			pcs_traits['nerd_points'] += pcs_traits['nerd_lessons'] - 17
-		elseif pcs_traits['nerd_lessons'] < 14:
-			pcs_traits['nerd_points'] -= iif(pcs_traits['nerd_status'] > 0, 5, 10)
+		if pcs_traits['nerd_point_gain_start'] = 1:
+			!!This check has to be changed if the number of non-sport lessons ever changes (27 right now)
+			if pcs_traits['nerd_lessons'] > 20:
+				pcs_traits['nerd_points'] += pcs_traits['nerd_lessons'] - 17
+			elseif pcs_traits['nerd_lessons'] < 14:
+				pcs_traits['nerd_points'] -= iif(pcs_traits['nerd_status'] > 0, 5, 10)
+			end
+		else
+			!! This is here such that you don''t get the point the first week, since it is only two days long.
+			pcs_traits['nerd_point_gain_start'] = 1
 		end
 		pcs_traits['nerd_lessons'] = 0
 	elseif university['semester_week'] > 0 and university['student'] = 1 and week = 5:

locations/uni_dorm.qsrc

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

locations/uni_lessons_electives1.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'Computers 101':
 	!!gs 'grades', 'attend_class', 'uni_teaching_studies_semester_1', 'Computers 101'
 	gs 'exp_gain', 'intel', rand(0,1)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/computer/class.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/computer/class.jpg"></center>'
 	'You walk into the classroom and take a seat at one of the computer lab stations. The rest of your classmates walk in one by one before Mr. Blagov enters the classroom and closes the door. He turns to the class and starts today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
@@ -146,7 +146,7 @@ if $ARGS[0] = 'Art 101':
 	gs 'exp_gain', 'agil', rand(0,1)
 	gs 'exp_gain', 'artskls', rand(0,1)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 	'You walk into the classroom and see Mr. Ilyushin standing by his desk as the rest of your classmates walk in one by one under his watchful eye. You notice his eyes linger a bit longer on some of the prettier girls that are dressed in revealing clothes. Once everyone is seated, he starts talking about art and what it means while being his usual friendly and overly chatty self. He seems very passionate about art and not only loves to draw and paint, but discuss what art means and it''s history in the world.'
 	act 'Pay attention in class':
 		*clr & cla
@@ -235,11 +235,11 @@ if $ARGS[0] = 'art_101_model':
 	if university['semester_week'] < 8:
 		temprand = rand(1,5)
 		if temprand = 1:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'Today is a lesson about the history of art and the effects it has had on society throughout the ages. Mr. Ilyushin focuses on one time period where art made a real difference, as he puts it, in the world. The lecture goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
@@ -247,7 +247,7 @@ if $ARGS[0] = 'art_101_model':
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand <= 5:
@@ -276,17 +276,17 @@ if $ARGS[0] = 'art_101_model_igor':
 	if university['semester_week'] < 8:
 		temprand = rand(1,5)
 		if temprand = 1:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'Today is a lesson about the history of art and the effects it has had on society throughout the ages. Mr. Ilyushin focuses on one time period where art made a real difference, as he puts it, in the world. The lecture goes by fairly quickly and Igor seems really engrossed by it.'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
 		end
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most.' 
 			'The class goes by fairly quickly.'
@@ -318,18 +318,18 @@ if $ARGS[0] = 'art_101_model_feofan':
 	if university['semester_week'] < 8:
 		temprand = rand(1,5)
 		if temprand = 1:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'Today is a lesson about the history and art and the effects it has had on society throughout the ages. Mr. Ilyushin focuses on one time period where art made a real difference, as he puts it, in the world. Feofan seems semi bored with the class and keeps doodling instead of listening, but the lecture goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point. Feofan mutters something about how he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
 			'The class goes by fairly quickly.'
 		elseif temprand <= 5:
@@ -359,12 +359,12 @@ if $ARGS[0] = 'art_101_model_natasha':
 	if university['semester_week'] < 8:
 		temprand = rand(1,5)
 		if temprand = 1:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'Today is a lesson about the history and art and the effects it has had on society throughout the ages. Mr. Ilyushin focuses on one time period where art made a real difference, as he puts it, in the world. The lecture goes by fairly quickly.'
 			'You notice that Natasha appears to like this lecture as she appears very comfortable with theory.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 			'You notice that Natasha really concentrates on the subject and seems to be very comfortable with the lesson.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
@@ -372,7 +372,7 @@ if $ARGS[0] = 'art_101_model_natasha':
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 			'You notice that Natasha seems happy drawing the object and gets on with it, rarely needing guidance from the professor, but the class goes by fairly quickly.'
 		elseif temprand <= 5:

locations/uni_lessons_electives2.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'Computers 102':
 	!!gs 'grades', 'attend_class', 'uni_teaching_studies_semester_2', 'Computers 102'
 	gs 'exp_gain', 'intel', rand(0,1)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/computer/class.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/computer/class.jpg"></center>'
 	'You walk into the classroom and take a seat at one of the computer lab stations. The rest of your classmates walk in one by one before Mr. Blagov enters the classroom and closes the door. He turns to the class and starts today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
@@ -146,7 +146,7 @@ if $ARGS[0] = 'Art 102':
 	gs 'exp_gain', 'agil', rand(0,1)
 	gs 'exp_gain', 'artskls', rand(0,1)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 	'You walk into the classroom and see Mr. Ilyushin standing by his desk as the rest of your classmates walk in one by one under his watchful eye. You notice his eyes linger a bit longer on some of the prettier girls that are dressed in revealing clothes. Once everyone is seated, he starts talking about art and what it means while being his usual friendly and overly chatty self. He seems very passionate about art and not only loves to draw and paint, but discuss what art means and it''s history in the world.'
 	act 'Pay attention in class':
 		*clr & cla
@@ -235,7 +235,7 @@ if $ARGS[0] = 'art_102_model':
 	if university['semester_week'] < 8:
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand <= 5:
@@ -255,7 +255,7 @@ if $ARGS[0] = 'art_102_model':
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand <= 5:
@@ -282,7 +282,7 @@ if $ARGS[0] = 'art_102_model_igor':
 	if university['semester_week'] < 8:
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
 		elseif temprand <= 5:
@@ -303,7 +303,7 @@ if $ARGS[0] = 'art_102_model_igor':
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
 		elseif temprand <= 5:
@@ -330,7 +330,7 @@ if $ARGS[0] = 'art_102_model_feofan':
 	if university['semester_week'] < 8:
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand <= 5:
@@ -352,7 +352,7 @@ if $ARGS[0] = 'art_102_model_feofan':
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand <= 5:
@@ -380,7 +380,7 @@ if $ARGS[0] = 'art_102_model_natasha':
 	if university['semester_week'] < 8:
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. This is a theory lesson which Natasha is clearly comfortable with and she doesn''t require any assistance from the lecturer. The class goes by fairly quickly.'
 		elseif temprand <= 5:
@@ -401,7 +401,7 @@ if $ARGS[0] = 'art_102_model_natasha':
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/class.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Natasha concentrates hard on the lecture and is clearly comfortable with a theory lesson. The lecturer didn''t need to come over to her and could concentrate on helping some of the other students. The class goes by fairly quickly.'
 		elseif temprand <= 5:

locations/uni_lessons_electivesev1.qsrc

@@ -13,29 +13,29 @@ if $ARGS[0] = 'computers_101':
 	uni_event_hour = 1
 	temp = rand(1,15)
 	if temp <= 2:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/computer/eatme.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/computer/eatme.jpg"></center>'
 		'As Mr. Blagov continues his lecture, you notice a boy sitting next to you looking past you. You turn your head and glance over to see a girl making the ''eat me'' sign with her fingers and tongue at him. You shake your head and go back to focusing on the lecture.'
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
-		act 'Wait for Anushka': gt 'uni_lessons_electives1', 'comp_nush'
+		act 'Wait for Anushka': gt 'uni_lessons_electivesev1', 'comp_nush'
 	elseif temp <= 4:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/computer/girl_wedgie.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/computer/girl_wedgie.jpg"></center>'
 		'During the short break in the middle of class, you hear a girl squeal and glance over in time to see her get a massive front and back wedgie from her friends as they pull her panty straps almost up to her shoulders. She laughs and promises dire consequences to them, which they just laugh off. Mr. Blagov then asks everyone to take their seats again and the rest of class flies by with nothing else of interest happening.'
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
-		act 'Wait for Anushka': gt 'uni_lessons_electives1', 'comp_nush'
+		act 'Wait for Anushka': gt 'uni_lessons_electivesev1', 'comp_nush'
 	elseif temp <= 6:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/computer/side_nipple.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/computer/side_nipple.jpg"></center>'
 		'As Mr. Blagov continues his lecture, you glance over and notice the girl just ahead of you wearing a loose shirt that''s open at the side, with no bra. As she leans forward in her seat, you can see her bare breast and nipple. You hear a few other whispers and can tell you''re not the only one to have noticed as you quickly focus back on the lecture.'
 		gs 'arousal', 'erotic', 1
 		gs 'stat'
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
-		act 'Wait for Anushka': gt 'uni_lessons_electives1', 'comp_nush'
+		act 'Wait for Anushka': gt 'uni_lessons_electivesev1', 'comp_nush'
 	elseif temp <= 8:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/computer/thong_exposed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/computer/thong_exposed.jpg"></center>'
 		'During the short break in the middle of class, many of the students gather around one of the desks. One of the students seems to have found something of interest, but you never find out what as a girl in front of you pulls up the back of her skirt to show off her thong clad ass and everyone is soon more interested in her antics. After spending a few minutes basking in the attention, she pulls her skirt back down and returns to her seat. Mr. Blagov soon asks everyone to take their seats again and the rest of class flies by with nothing else of interest happening.'
 		gs 'arousal', 'erotic', 1
 		gs 'stat'
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
-		act 'Wait for Anushka': gt 'uni_lessons_electives1', 'comp_nush'
+		act 'Wait for Anushka': gt 'uni_lessons_electivesev1', 'comp_nush'
 	elseif temp = 9:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/uni/classroom/comp_djibril1.jpg"></center>'
 		if anushkaQW['djibril_sex'] >= 1:
@@ -425,7 +425,7 @@ if $ARGS[0] = 'computers_101':
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 		'As you sit listening to the lesson, you look around hoping something interesting will happen, but nothing does.'
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
-		act 'Wait for Anushka': gt 'uni_lessons_electives1', 'comp_nush'
+		act 'Wait for Anushka': gt 'uni_lessons_electivesev1', 'comp_nush'
 	end
 end
 
@@ -509,15 +509,15 @@ if $ARGS[0] = 'art_101':
 	uni_event_hour = 1
 	!!temp = rand(1,10)
 	!!if temp = 1:
-		!!'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/girl_goofing.jpg"></center>'
+		!!'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/girl_goofing.jpg"></center>'
 		!!'Placeholder text'
 		!!act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	!!elseif temp = 2:
-		!!'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/art/girls_dryhump.jpg"></center>'
+		!!'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/girls_dryhump.jpg"></center>'
 		!!'Text for future events'
 		!!act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	!!else
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/class.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 		'As you sit listening to the lesson, you look around hoping something interesting will happen, but nothing does.'
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	!!end

locations/vanrPar.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = '':
 			act '<b>Return to the hallway</b>': gt 'korrPar'
 		end
 	elseif vanr_lock = 1:
-		act 'Unlatch the door and leave': vanr_lock = 0 & gt 'kuhrPar'
+		act 'Unlatch the door and leave': vanr_lock = 0 & gt 'korrPar'
 	end
 
 	gs 'din_van', 'private'

locations/version.qsrc

@@ -2,27 +2,49 @@
 
 act 'Return': gt 'start'
 
+'0.9.0.1'
+'- Anushka and the boys living in the city so their story can be started in the city or picked up again in the city content by nutluck with code from HotMike'
+'- New sauna scene for Vicky''s house invite, to replace the beach scene during the winter.(Virgin/Lesbian Safe) - Derryth_Love'
+'- Tit fucking scenes added to porn studio - Vengeance_11'
+'- Minor sex event between Marcus and Irina added to school - Vengeance_11'
+'- Sugarcube conversion being built entirely by steuchs, has its own IGDB entry for current demo build'
+'- new code testing program built and tested by netuttki'
+'- You can now select electives on uni starts text for them from nutluck and code by bgkjdgbizgblzdgbr'
+'- Generic reactions for chats at school linked after pending for some time, worked on by whole team but special mention to bg for the code.'
+'- fixed the underwear filters and added shop filters for underwear - KS'
+'- Heritage museum from BBZ01 with code from KS'
+'- Filters for shoes from KS'
+'- More modelling and porn talk options with Albina from hornguy6'
+'- Comments to the school chats for the new sub categories of uniform from BBZ01'
+'- Photography shop code overhaul from VOS/Hooded Silence'
+'- Big Katja nightclub content. Plus system for Katja doing things with out the player being there (sex/drugs), and changes to allow start of Katja''s quest in different states of her sexual progression, from bgkjdgbizgblzdgbr'
+'- Tanya dates revamped by BBZ01 with code from KS'
+'- Christina shower humiliation is now linear until her house unlocks, then resumes random thanks to Anya'
+'- Text edits from Vengeange_11, HotMike and hornguy6'
+'- Bug fixes from Kevin Smarts, hornguy6, Anya, bgkjdgbizgblzdgbr, HotMike, hornguy6, VOS, and netuttki'
+'- Image pack from Anya'
+
 '0.9'
-'- Stamina reworked to have meaning and work as limitor for exercising from bgkjdgbizgblzdgbr'
+'- Stamina reworked to have meaning and work as limiter for exercising from bgkjdgbizgblzdgbr'
 '- New 2023 splash screens at game start from Gwen'
 '- Random photo event added to park by HotMike'
 '- Small update on the City Nightclub. A full bar with menu, nomore prostitution but you can be picked up by a couple on the dance floor from bgkjdgbizgblzdgbr'
 '- Music store a bit more organic with some new bits from nutluck, coded by bgkjdgbizgblzdgbr'
 '- Sonia content relating to her fail from nutluck with code from bgkjdgbizgblzdgbr'
-'- Minor dilogue scenes added to pharmacy by BBZ01 with code from Hooded Silence'
+'- Minor dialogue scenes added to pharmacy by BBZ01 with code from Hooded Silence'
 '- Sleep should set to 100 if you have enough sleep now, and thousands of number separators added by Hooded Silence'
 '- various small things from hornguy6 (Idk)'
 '- New exercises for butt training and heavy weights to use the code below from Kevin Smarts'
 '- Code to allow training of butt and strength beyond 100 for bodybuilder Sveta from bgkjdgbizgblzdgbr'
 '- View bodysuit in stat window thanks to jeep91'
-'- The Uni Cafe now uses the system for bying food introduced with The Coffee Hole - bgkjdgbizgblzdgbr'
-'- new Katya events at Coffe hole and Uni from bgkjdgbizgblzdgbr'
-'- Clothing now tracks exposure of pussy, butt and nipples with extention to inhib range for them and school uniform checks now include skimpy tops by Kevin Smarts'
+'- The Uni Café now uses the system for bying food introduced with The Coffee Hole - bgkjdgbizgblzdgbr'
+'- new Katya events at Coffee hole and Uni from bgkjdgbizgblzdgbr'
+'- Clothing now tracks exposure of pussy, butt and nipples with extension to inhib range for them and school uniform checks now include skimpy tops by Kevin Smarts'
 '- small QoL fix to the stats display to add a date suffix based on the event generator system from Hooded Silence'
 '- Default school and sports uniforms now set by button in wardrobe and short cut to change into sports in suitable locations by Kevin Smarts'
 '- Can now end the rental agreement in shared apartment from Kevin Smarts'
 '- Starting willpower adjustment to fit lower max for various school groups from nutluck'
-'- filters for underwear and disposal for unwanted boidysuits from Kevin Smarts'
+'- filters for underwear and disposal for unwanted bodysuits from Kevin Smarts'
 '- Text edits from Vengeange_11, HotMike and nutluck'
 '- Bug fixes from Kevin Smarts, hornguy6, Derryth_Love, maankamara, Hooded Silence, Sword, bgkjdgbizgblzdgbr, noobtrain, 3xpurt, jeep91, Unstable.Egghead, HotMike and Anya.'
 '- Image pack from Anya (dev pack 0.9.0)'

tools/syntax/NotepadPlusPlus/QSP6.xml

@@ -0,0 +1,64 @@
+<NotepadPlus>
+    <UserLang name="QSP_colour2" ext="qsrc" udlVersion="2.1">
+        <Settings>
+            <Global caseIgnored="no" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
+            <Prefix Keywords1="no" Keywords2="no" Keywords3="no" Keywords4="no" Keywords5="no" Keywords6="no" Keywords7="no" Keywords8="no" />
+        </Settings>
+        <KeywordLists>
+            <Keywords name="Comments">00! 01 02 03 04</Keywords>
+            <Keywords name="Numbers, prefix1"></Keywords>
+            <Keywords name="Numbers, prefix2"></Keywords>
+            <Keywords name="Numbers, extras1"></Keywords>
+            <Keywords name="Numbers, extras2"></Keywords>
+            <Keywords name="Numbers, suffix1"></Keywords>
+            <Keywords name="Numbers, suffix2"></Keywords>
+            <Keywords name="Numbers, range"></Keywords>
+            <Keywords name="Operators1">, . * + - / = [ ( ] ) { } : &amp; &lt; &gt; &quot;</Keywords>
+            <Keywords name="Operators2"></Keywords>
+            <Keywords name="Folders in code1, open"></Keywords>
+            <Keywords name="Folders in code1, middle"></Keywords>
+            <Keywords name="Folders in code1, close"></Keywords>
+            <Keywords name="Folders in code2, open"></Keywords>
+            <Keywords name="Folders in code2, middle"></Keywords>
+            <Keywords name="Folders in code2, close"></Keywords>
+            <Keywords name="Folders in comment, open"></Keywords>
+            <Keywords name="Folders in comment, middle"></Keywords>
+            <Keywords name="Folders in comment, close"></Keywords>
+            <Keywords name="Keywords1">$dyneval $user_text $usrtxt $maintxt $stattxt $func $curloc $selobj $selact $curact $getobj $mid $ucase $lcase $trim $replace $str $loc $loc_arg $menu_loc $menu_arg $locM_arg $locM $strfind $ARGS&#x000D;&#x000A;&#x000D;&#x000A;dyneval input user_text usrtxt iif rgb isplay msecscount desc maintxt stattxt qspver func curloc selobj no and mod selact curact arrsize arrpos countobj getobj led mid ucase lcase trim replace instr isnum val str loc or max min rand rnd arrcomp strcomp strpos strfind&#x000D;&#x000A;&#x000D;&#x000A;counter ongload ongsave onnewloc onactsel onobjsel onobjadd onobjdel usercom fname backimage args result&#x000D;&#x000A;&#x000D;&#x000A;act exit killvar cla clr clear gs xgt gt goto gosub xgoto if else elseif end jump amp nl pl&#x000D;&#x000A;&#x000D;&#x000A;nosave disablescroll disablesubex debug usehtml bcolor fcolor lcolor fsize gt lt close dynamic wait</Keywords>
+            <Keywords name="Keywords2"></Keywords>
+            <Keywords name="Keywords3"></Keywords>
+            <Keywords name="Keywords4"></Keywords>
+            <Keywords name="Keywords5"></Keywords>
+            <Keywords name="Keywords6"></Keywords>
+            <Keywords name="Keywords7"></Keywords>
+            <Keywords name="Keywords8"></Keywords>
+            <Keywords name="Delimiters">00&apos; 01 02&apos; 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
+        </KeywordLists>
+        <Styles>
+            <WordsStyle name="DEFAULT" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="COMMENTS" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="LINE COMMENTS" fgColor="808080" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="NUMBERS" fgColor="800080" bgColor="FFFFFF" fontStyle="1" nesting="0" />
+            <WordsStyle name="KEYWORDS1" fgColor="0000FF" bgColor="FFFFFF" fontStyle="1" nesting="0" />
+            <WordsStyle name="KEYWORDS2" fgColor="0000A0" bgColor="FFFFFF" fontStyle="1" nesting="0" />
+            <WordsStyle name="KEYWORDS3" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS4" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS5" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS6" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS7" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS8" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="OPERATORS" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="FOLDER IN CODE1" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="FOLDER IN CODE2" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="FOLDER IN COMMENT" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS1" fgColor="008040" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS2" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS3" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS4" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS5" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS6" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS7" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS8" fgColor="000000" bgColor="FFFFFF" fontStyle="0" nesting="0" />
+        </Styles>
+    </UserLang>
+</NotepadPlus>