Merge remote-tracking branch 'Anya/master'

locations/kuhrPar.qsrc

@@ -50,9 +50,9 @@ if locat['Mother'] = 4:
 	end
 end
 
-if (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week < 6 and locat['Fam_inGad'] = 0:
+if ((hour = 6 and minut >= 45) or (hour = 7 and minut <= 15)) and week < 6 and locat['Fam_inGad'] = 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 locat['Fam_inGad'] = 0:
+elseif ((hour = 6 and minut >= 45) or (hour = 7 and minut <= 15)) and week > 5 and locat['Fam_inGad'] = 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 locat['Fam_inGad'] = 0 and locat['Anya'] = 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.'
@@ -74,7 +74,7 @@ if locat['Stepdad'] = 7: '<a href="exec:gt''father''">Your stepfather</a> is her
 
 if week = 6 and locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0 and hour > 9 and hour < 12:'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.'
 
-if (hour = 6 and minut >= 45) or (hour = 7 and minut < 15) and breakfast_day ! daystart and locat['Fam_inGad'] = 0: 
+if ((hour = 6 and minut >= 45) or (hour = 7 and minut < 15)) and breakfast_day ! daystart and locat['Fam_inGad'] = 0: 
 	if PCloswimwear ! 1 and $clothingworntype ! 'nude':
 		act 'Eat breakfast with your family (0:20)': 
 			*clr & cla