Merge remote-tracking branch 'Anya/master'

locations/family_schedule.qsrc

@@ -19,7 +19,7 @@ if sister_indorf = 0:
 			anyaloc = 1
 			anyaloc['athome'] = 0
 			anyaloc['inroom'] = 1
-		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!!Family breakfast
 			anyaloc = 2
 			anyaloc['athome'] = 1
@@ -80,7 +80,7 @@ if sister_indorf = 0:
 					anyaloc['inroom'] = 0
 				end
 			end
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			if week = 5:
 				!!Goes to a party
 				anyaloc = 24
@@ -141,7 +141,7 @@ if sister_indorf = 0:
 			anyaloc = 1
 			anyaloc['athome'] = 0
 			anyaloc['inroom'] = 1
-		elseif hour = 9 and minut < 20:
+		elseif hour = 9 and minut <= 20:
 			!!Eat something in kitchen
 			anyaloc = 16
 			anyaloc['athome'] = 1
@@ -180,7 +180,7 @@ if sister_indorf = 0:
 				anyaloc['athome'] = 0
 				anyaloc['inroom'] = 0
 			end
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			if week = 6:
 				!!Goes to a party
 				anyaloc = 24
@@ -243,13 +243,13 @@ if indorf = 0:
 		elseif hour = 6 or (hour = 7 and minut < 30):
 			momloc = 4
 			momloc['athome'] = 1
-			if hour = 6 and minut < 40:
+			if hour = 6 and minut <= 40:
 				!! Make Breakfast
 				momloc['kitchen_action'] = 1
 			elseif hour = 6 and minut < 45:
 				!! Set breakfast table - ask Sveta to do it if she comes into the kitchen at that time
 				momloc['kitchen_action'] = 2
-			elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
+			elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 				!! Family breakfast
 				momloc['kitchen_action'] = 3
 			else
@@ -281,7 +281,7 @@ if indorf = 0:
 			!!Making dinner (On Friday she brings home leftovers from the cafe)
 			momloc = 11
 			momloc['athome'] = 1
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			!!Family dinner
 			momloc = 12
 			momloc['athome'] = 1
@@ -335,13 +335,13 @@ if indorf = 0:
 		elseif hour = 6 or (hour = 7 and minut < 30):
 			momloc = 4
 			momloc['athome'] = 1
-			if hour = 6 and minut < 40:
+			if hour = 6 and minut <= 40:
 				!! Make Breakfast
 				momloc['kitchen_action'] = 1
 			elseif hour = 6 and minut < 45:
 				!! Set breakfast table - ask Sveta to do it if she comes into the kitchen at that time
 				momloc['kitchen_action'] = 2
-			elseif hour = 6 or (hour = 7 and minut < 15):
+			elseif hour = 6 or (hour = 7 and minut <= 15):
 				!! Family breakfast
 				momloc['kitchen_action'] = 3
 			else
@@ -381,7 +381,7 @@ if indorf = 0:
 			!! Making dinner
 			momloc = 11
 			momloc['athome'] = 1
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			!!Family dinner
 			momloc = 12
 			momloc['athome'] = 1
@@ -429,7 +429,7 @@ if indorf = 0:
 			!!Getting ready
 			sdadloc = 2
 			sdadloc['athome'] = 1
-		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!!family breakfast
 			sdadloc = 3
 			sdadloc['athome'] = 1
@@ -453,7 +453,7 @@ if indorf = 0:
 			!! Sets the table for dinner
 			sdadloc = 7
 			sdadloc['athome'] = 1
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			!! Family dinner
 			sdadloc = 8
 			sdadloc['athome'] = 1
@@ -497,7 +497,7 @@ if indorf = 0:
 			!!Getting ready
 			sdadloc = 2
 			sdadloc['athome'] = 1
-		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!!family breakfast
 			sdadloc = 3
 			sdadloc['athome'] = 1
@@ -527,7 +527,7 @@ if indorf = 0:
 			!!In the garage
 			sdadloc = 9
 			sdadloc['athome'] = 1
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			!! Family dinner
 			sdadloc = 8
 			sdadloc['athome'] = 1
@@ -564,7 +564,7 @@ if indorf = 0:
 				kolloc = 2
 				kolloc['athome'] = 1
 			end
-		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!! Family Breakfast
 			kolloc = 3
 			kolloc['athome'] = 1
@@ -628,7 +628,7 @@ if indorf = 0:
 				kolloc = 2
 				kolloc['athome'] = 1
 			end
-		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!! Family Breakfast
 			kolloc = 3
 			kolloc['athome'] = 1
@@ -650,7 +650,7 @@ if indorf = 0:
 			!! Leaves apartment
 			kolloc = 9
 			kolloc['athome'] = 0
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			!! Family Dinner
 			kolloc = 8
 			kolloc['athome'] = 1

locations/kuhrPar.qsrc

@@ -50,13 +50,13 @@ if momloc = 4:
 	end
 end
 
-if (hour = 6 and minut > 45) or (hour = 7 and minut < 15) and week < 6 and indorf = 0:
+if (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week < 6 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. You could sit down and join them for breakfast or just grab something and go.'
-elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15) and week > 5 and indorf = 0:
+elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week > 5 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
-elseif hour = 18 and minut < 30 and indorf = 0 and anyaloc = 12:
+elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc = 12:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
-elseif hour = 18 and minut < 30 and indorf = 0:
+elseif hour = 18 and minut <= 30 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 else
 	'The kitchen is not very impressive, but it has everything your family needs. Since everyone can''t always join for family meals, your <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge. Of course, you could also just have a snack if you''re not that hungry.'