Browse Source

[fixed] Katja's schedule did take into account you would leave for the disco before 20.

bgkjdgbizgblzdgbr 10 months ago
parent
commit
fb018a8a79
1 changed files with 42 additions and 18 deletions
  1. 42 18
      locations/katja_meynold_schedule.qsrc

+ 42 - 18
locations/katja_meynold_schedule.qsrc

@@ -382,12 +382,20 @@ 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
+						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:
@@ -763,15 +771,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 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
+					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):
@@ -1182,12 +1197,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
+							else
+								if locat['katja_save2'] = 35 and minut >= 45:
+									locat['katja_save2'] = 37
+								end
+								locat['katja'] = locat['katja_save2']
+							end
+						end			
 					end
 				end
 			elseif hour < 23: