[fixed] More fixes so Katja will actaully go th the nightclub whne she is supposed to.

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,24 +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']						
-						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'
+						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

@@ -413,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
@@ -773,7 +777,7 @@ else
 				end
 			elseif hour < 20:
 				if locat['katja_rand2'] ! daystart:
-					if week < 4 or (week = 4 and university['exam_week'] = 1 and katjaQW['QWstage'] < 3 and katjaQW['liberated'] = 0):
+					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):
@@ -1203,12 +1207,15 @@ else
 							if minut < 45:
 								!!Dormroom - getting ready to go out
 								locat['katja']  = 35
-								locat['katja_save2'] = locat['katja']
 							else
 								!!Out -going to a party/bar/cafe
 								locat['katja']  = 37
-								locat['katja_save2'] = locat['katja']
 							end
+						else
+							if locat['katja_save2'] = 35 and minut >= 45:
+								locat['katja_save2'] = 37
+							end
+							locat['katja'] = locat['katja_save2']
 						end			
 					end
 				end
@@ -1221,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
@@ -1235,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']