[fixed] update code in Vika file to use gs calls and conditionals for the three different scenarios it contains (Vika asleep, Vika celebrating your birthday, Vika awake but not celebrating your birthday) to simplify it and remove need for cls and exit calls. also updated the line for seeing Vika sleeping to not question whether she worked in the brothel to be consistent with the line in the dorm room file you click to reach it, which mentions that she did work in the brothel

locations/Vika.qsrc

@@ -1,152 +1,158 @@
 # Vika
 !2020/10/16/Gwen
-vikaAge = age + 1
-gs'stat'
-'<center><B><font color=maroon>Vika Kirilova</font></B></center>'
-'<center><img <<$set_imgh>> src="images/characters/shared/photos/big220.jpg" ></center>'
-'Your university roommate is Vika Kirilova. She is <<vikaAge>> years old. She came from a town much further away than you did, and like you, she comes from a poor family.'
-if vikaslut = 1:
-	'You know Vika works as a whore in a brothel in the red light district.'
-else
-	'You don''t really know much more about her yet.'
+
+if $ARGS[0] = '':
+	vikaAge = age + 1
+	gs'stat'
+	'<center><B><font color=maroon>Vika Kirilova</font></B></center>'
+	if vika_sleep = 1:
+		gs 'Vika', 'asleep'
+	else
+		gs 'Vika', 'awake'
+	end
 end
 
-if npc_rel['A220'] < 20:
-	'You and Vika are strangers to each other.'
-elseif npc_rel['A220'] < 40:
-	'You and Vika are getting to know each other.'
-elseif npc_rel['A220'] < 60:
-	'You and Vika are on friendly terms.'
-elseif npc_rel['A220'] < 80:
-	'The two of you are friends.'
-else
-	'The two of you are best friends.'
+if $ARGS[0] = 'awake':
+	!! Display different image during birthday event.
+	if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika1.jpg" ></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big220.jpg" ></center>'
+	end
+	'Your university roommate is Vika Kirilova. She is <<vikaAge>> years old. She comes from a town much further away than yours, and like you, she comes from a poor family.'
+	if vikaslut = 1:
+		'You know Vika works as a whore in a brothel in the red light district.'
+	else
+		'You don''t really know much more about her yet.'
+	end
+
+	if npc_rel['A220'] < 20:
+		'You and Vika are strangers to each other.'
+	elseif npc_rel['A220'] < 40:
+		'You and Vika are getting to know each other.'
+	elseif npc_rel['A220'] < 60:
+		'You and Vika are on friendly terms.'
+	elseif npc_rel['A220'] < 80:
+		'The two of you are friends.'
+	else
+		'The two of you are best friends.'
+	end
+	''
+
+	if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+		gs 'Vika', 'birthday'
+	else
+		gs 'Vika', 'normal_day'
+	end
 end
-''
-act '<B>Move away</B>':gt $loc, $loc_arg
 
-if vika_sleep = 1 and vikaslut = 0:
-	cls
+if $ARGS[0] = 'asleep':
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep.jpg" ></center>'
-	'Vika is sleeping in her bed, after a night of adventures. While watching her, you wonder what all she got up to tonight.'
+	if vikaslut = 1:
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep_b.jpg" ></center>'
+		'Vika is sleeping in her bed, naked. You wonder what she did in the brothel tonight to pay for her tuition.'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep.jpg" ></center>'
+		'Vika is sleeping in her bed after a night of adventures. While watching her, you wonder what all she got up to tonight.'
+	end
 	act '<B>Move away</B>':gt $loc, $loc_arg
-	exit
 end
 
-if vika_sleep = 1 and vikaslut = 1:
-	cls
-	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep_b.jpg" ></center>'
-	'Vika is sleeping in her bed, naked. You wonder if she worked in the brothel tonight to pay for her tuition.'
+if $ARGS[0] = 'normal_day':
 	act '<B>Move away</B>':gt $loc, $loc_arg
-	exit
-end
 
-if hour < 20:
-	act 'Chatting with Vika (00:15)':
-		cla
-		minut += 15
-		if vikachatday ! daystart: npc_rel['A220'] += 3
-		vikachatday = daystart
-		talkrand = RAND(0,10)
-		if talkrand = 0:
-			'You start talking with Vika. She tells you about the boys she''s met, about parties, about cosmetics.'
-		elseif talkrand = 1:
-			'Vika says she was in this cafe and got invited to dance by a guy who then paid her bill.'
-		elseif talkrand = 2:
-			'Vika says that working as a stripper in the strip club is a rather profitable job for students, although clients are very grabby.'
-		elseif talkrand = 3:
-			'Vika tells you that a few girls from the track team at the university go to the European level sports competitions and earn big money, though of course Vika admits that she is too lazy to put in the effort to make the team.'
-		elseif talkrand = 4:
-			'Vika says that one of her friends who''s a guy did not pull out in time and came inside of her. But Vika is smarter than that. She buys birth control pills at the pharmacy control. Then it doesn''t matter if the guy pulls out or wears a condom.'
-		elseif talkrand = 5:
-			'Vika says in the park, she accidentally went to an area and was offered money for sex.'
-		elseif talkrand = 6:
-			'Vika tells how she did a nude photo shoot at the photography studio, but it is bad for your reputation to do.'
-		elseif talkrand = 7:
-			'Vika tells a horror story about how a nice girl did not wash or shave, then she began to smell so terrible and got a vaginal infection.'
-		elseif talkrand = 8:
-			'Vika says that she buys tampons and always keeps a reserve of them even if she is on the birth control shot.'
-		elseif talkrand = 9:
-			'Vika tells how one of her guys likes anal sex, but she didn''t have any lube, but let him fuck her anyways. She tells you how it hurt a lot at first but then she started to like it anyways.'
-		else
-			'Vika tells how she was sunbathing in the summer on the beach and that she needed to buy a new swimsuit. Having one is useful in winter too for using the pool, which is a great way to keep yourself in good shape.'
+	if hour < 20:
+		act 'Chat with Vika (00:15)':
+			cla
+			minut += 15
+			if vikachatday ! daystart: npc_rel['A220'] += 3
+			vikachatday = daystart
+			talkrand = RAND(0,10)
+			if talkrand = 0:
+				'You start talking with Vika. She tells you about the boys she''s met, about parties, about cosmetics.'
+			elseif talkrand = 1:
+				'Vika says she was in this cafe and got invited to dance by a guy who then paid her bill.'
+			elseif talkrand = 2:
+				'Vika says that working as a stripper in the strip club is a rather profitable job for students, although clients are very grabby.'
+			elseif talkrand = 3:
+				'Vika tells you that a few girls from the track team at the university go to the European level sports competitions and earn big money, though of course Vika admits that she is too lazy to put in the effort to make the team.'
+			elseif talkrand = 4:
+				'Vika says that one of her friends who''s a guy did not pull out in time and came inside of her. But Vika is smarter than that. She buys birth control pills at the pharmacy control. Then it doesn''t matter if the guy pulls out or wears a condom.'
+			elseif talkrand = 5:
+				'Vika says in the park, she accidentally went to an area and was offered money for sex.'
+			elseif talkrand = 6:
+				'Vika tells how she did a nude photo shoot at the photography studio, but it is bad for your reputation to do.'
+			elseif talkrand = 7:
+				'Vika tells a horror story about how a nice girl did not wash or shave, then she began to smell so terrible and got a vaginal infection.'
+			elseif talkrand = 8:
+				'Vika says that she buys tampons and always keeps a reserve of them even if she is on the birth control shot.'
+			elseif talkrand = 9:
+				'Vika tells how one of her guys likes anal sex, but she didn''t have any lube, but let him fuck her anyways. She tells you how it hurt a lot at first but then she started to like it anyways.'
+			else
+				'Vika tells how she was sunbathing in the summer on the beach and that she needed to buy a new swimsuit. Having one is useful in winter too for using the pool, which is a great way to keep yourself in good shape.'
+			end
+
+			act 'Finish': gt 'Vika'
 		end
+		act 'Study with Vika (1:00)':
+			cla
+			minut += 60
+			intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
+			npc_rel['A220'] += 1
+			'You get out your textbooks and notes, while you and Vika sit down together on the bed to study. You help each other with your classwork, making it much easier and more fun to study.'
 
-		act 'Finish': gt 'Vika'
-	end
-	act 'Study with Vika (1:00)':
-		cla
-		minut += 60
-		intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
-		npc_rel['A220'] += 1
-		'You get out your textbooks and notes, while you and Vika sit down together on the bed to study. You help each other with your classwork, making it much easier and more fun to study.'
-
-		act 'Finish':gt'Vika'
-	end
+			act 'Finish':gt'Vika'
+		end
 
-	if vikasex > 0 and npc_rel['A220'] > 40:
-		gs 'willpower', 'cuni', 'self', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Suggest you do something fun (<<will_cost>> Willpower)':
-				gs 'willpower', 'pay', 'self'
-				minut += 60
-				npc_rel['A220'] += 5
-				$sexloc = 'obroom'
-				gt'lezbsex','start'
+		if vikasex > 0 and npc_rel['A220'] > 40:
+			gs 'willpower', 'cuni', 'self', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Suggest you do something fun (<<will_cost>> Willpower)':
+					gs 'willpower', 'pay', 'self'
+					minut += 60
+					npc_rel['A220'] += 5
+					$sexloc = 'obroom'
+					gt'lezbsex','start'
+				end
+			else
+				act 'Suggest you do something fun (<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 'Suggest you do something fun (<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 npc_rel['A220'] > 80 and vikaslut = 0:
-		act 'Ask where she goes at night':
-			cla
-			minut += 30
-			vikaslut = 1
-
-			'Vika hesitates and blushes, "I''m just walking around the city..."'
-			'"So you just walk around the city all night long? You expect me to believe that? I thought we were friends, but if you don''t want to tell me, that''s fine." You try not to be disappointed she won''t tell you, as you understand it is none of your business.'
-			'"I work at the local night club..." Vika mumbles hesitantly.'
-			'"I have been to that club many times and have not seen you there, ever." you feel hurt as she''s bluntly lying to your face. "If you don''t want me to know where you go, just say so. I was just hoping we could go together and hang out," you say and turn away, feeling rejected.'
-			'"Don''t be mad. I''ll show you. Just promise you''ll still be my friend."'
-			'You are taken aback by these words. Why would you not want to be her friend? "Yes, Of course we''ll still be friends."'
-			'"I will show you then," she tells you'
-
-			act 'Follow Vika': gt 'bordelv', 'start'
-		end
-	elseif npc_rel['A220'] > 80 and vikaslut = 1 and bordel = 0:
-		act 'Ask about work':
-			cla
-			npc_rel['A220'] += 5
-			bordel = 1
-			odkomp = 0
+		if npc_rel['A220'] > 80 and vikaslut = 0:
+			act 'Ask where she goes at night':
+				cla
+				minut += 30
+				vikaslut = 1
+
+				'Vika hesitates and blushes, "I''m just walking around the city..."'
+				'"So you just walk around the city all night long? You expect me to believe that? I thought we were friends, but if you don''t want to tell me, that''s fine." You try not to be disappointed she won''t tell you, as you understand it is none of your business.'
+				'"I work at the local night club..." Vika mumbles hesitantly.'
+				'"I have been to that club many times and have not seen you there, ever." you feel hurt as she''s bluntly lying to your face. "If you don''t want me to know where you go, just say so. I was just hoping we could go together and hang out," you say and turn away, feeling rejected.'
+				'"Don''t be mad. I''ll show you. Just promise you''ll still be my friend."'
+				'You are taken aback by these words. Why would you not want to be her friend? "Yes, Of course we''ll still be friends."'
+				'"I will show you then," she tells you'
+
+				act 'Follow Vika': gt 'bordelv', 'start'
+			end
+		elseif npc_rel['A220'] > 80 and vikaslut = 1 and bordel = 0:
+			act 'Ask about work':
+				cla
+				npc_rel['A220'] += 5
+				bordel = 1
+				odkomp = 0
 
-			'"Do you think you could get me a job at the brothel?" you ask.'
-			'"Well I can ask the manager, but I can''t guarantee anything. Come by after 20:00, and I''ll see what I can do."'
+				'"Do you think you could get me a job at the brothel?" you ask.'
+				'"Well I can ask the manager, but I can''t guarantee anything. Come by after 20:00, and I''ll see what I can do."'
 
-			act 'Finish': gt 'Vika'
+				act 'Finish': gt 'Vika'
+			end
 		end
 	end
 end
 
-if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
-	cls
-	gs 'stat'
+if $ARGS[0] = 'birthday':
 	b_vika_present_Day = daystart
-	'<center><B><font color=maroon>Vika Kirilova</font></B></center>'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika1.jpg" ></center>'
-    'Your university roommate is Vika. She is <<vikaAge>> years old. She came from a town much further away than you did, and like you, she comes from a poor family.'
-    'You know Vika works as a whore in a brothel in the city central area.'
-
-	if npc_rel['A220'] < 80:
-		'Vika and you are friends.'
-	else
-		'Vika and you are close friends.'
-	end
-	''
 	'You don''t have time to say a word before Vika practically pounces on you.'
 	'"There is my favorite birthday girl, Happy Birthday!" she screeches as she hugs and kisses you on the cheek.'
 	'"Wow! This is so unexpected," you reply.'
@@ -157,7 +163,6 @@ if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut
 	'"You look great, it fits nice, good! I was worried it wouldn''t fit as I had to guess your size. Here put this on. We need to go to your other present." Vika throws you a bathrobe and grabs you by the arm and drags you out of the room as you struggle to get the robe on in time.'
 
 	act 'Where are we heading?': gt 'univer_din', 'b_vika_present_start'
-	exit
 end
 
 --- Vika ---------------------------------