[changed] Family schedule tweaks and edits, mostly for Anya

locations/Komp.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'porno':
 		'You have no prepaid internet access remaining. You need to buy more, before you can go online again.'
 
 		act '<B>Close the browser</B>':gt 'komp','start'
-	elseif sisterHere > 0 and sisboytrio = 0 and $loc = 'bedrPar':
+	elseif anyaloc['inroom'] = 1 and sisboytrio = 0 and $loc = 'bedrPar':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
 
@@ -594,7 +594,7 @@ if $ARGS[0] = 'mfc':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
 		'It''s that time of the month! You feel sick to your stomach and the cramps hurt pretty badly from time to time... you''re in no condition to earn money showing off your body.'
 		act 'Leave this website':gt 'komp','brows'
-	elseif sisterHere = 0 or $loc ! 'bedrPar':
+	elseif anyaloc['inroom'] = 0 or $loc ! 'bedrPar':
 		act 'Go to your MFC homepage':
 			*clr & cla
 			minut += 2
@@ -614,7 +614,7 @@ if $ARGS[0] = 'mfc':
 			gs 'stat'
 			gt 'komp','brows'
 		end
-	elseif sisterHere > 0 and $loc = 'bedrPar':
+	elseif anyaloc['inroom'] = 1 0 and $loc = 'bedrPar':
 		*clr & cla
 		minut += 2
 		topmfc = 1
@@ -1731,7 +1731,7 @@ if $ARGS[0] = 'waitclients':
 			act'Continue':gt'komp','waitclients'
 		end
 	end
-	if sisterHere > 0 and $loc = 'bedrPar':
+	if anyaloc['inroom'] = 1 and $loc = 'bedrPar':
 		*clr & cla
 		topmfc = 1
 		backmfc = 1

locations/bed2.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = '':
 	end
 	gs 'events', 'read'
 
-	if sisterHere = 0 or (sisterHere = 1 and hour < 7):
+	if anyaloc['inroom'] = 0 or anyaloc = 1 or anyaloc = 26:
 		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and fame['pav_slut'] >= 150) or (pcs_horny > 50 and fame['pav_slut'] >= 50 and pcs_inhib >= 60):
 			act 'Masturbate':
 				InSleep = 0

locations/bedrPar.qsrc

@@ -49,13 +49,13 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gs 'stat'
 		
 		act 'Continue':gt $loc, $loc_arg
-	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:
+	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and anyaloc['inroom'] = 0:
 		gt 'tobiQW', 'start'
 		
 	elseif anyaloc = 11: 
 		gt 'sisterQW', 'sisboyQW_expel'
 		
-	elseif sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
+	elseif anyaloc['inroom'] = 1 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
@@ -139,8 +139,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your desk.'
 
 		if npc_QW['A33'] > 10:npc_QW['A33'] = 10
-		!!Default is Anya not being here or being asleep, can be overwritten in next block
-		sisterHere = 0
 
 		if sister_indorf = 0:
 			if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
@@ -159,11 +157,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					'<a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
 				elseif anyaloc = 4:
 					sisterdialog = 3
-					sisterHere = 1
 					'<a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
 				elseif anyaloc = 15:
 					if anyaQW['bathroom_dildos'] > 0:gt'sister_chat','bathroom_dildo_talk1'
-					sisterHere = 1
 					'<a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
 				elseif anyaloc = 26:
 					if sisboypartyQW = 1: sisboypartyQW = 2
@@ -186,7 +182,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
 		sis_watch = 0
 
-		if sisterHere = 0 or sisboytrio > 0:
+		if anyaloc['inroom'] = 0 or sisboytrio > 0:
 			if pornMagazine > 0:gs 'events', 'read_porn'
 			if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
 				act 'Send Rex a text message': gt 'rex_events','sms'
@@ -203,7 +199,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
 
-		if sisterHere = 0: dynamic $palelady
+		if anyaloc['inroom'] = 0: dynamic $palelady
 
 		gs 'exercise', 'start'
 
@@ -314,7 +310,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
-				if sisterHere = 1 and pcs_inhib < 30:
+				if anyaloc['inroom'] = 1 and pcs_inhib < 30:
 					if pcs_inhib < 10:
 						$diff = 'hard'
 					elseif pcs_inhib < 20:
@@ -340,7 +336,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			!! Streaming music
-			if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+			if ml_guitar['hasguitar'] = 1 and anyaloc['inroom'] = 0 and ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
 				ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 
 				if pcs_inhib < 30:
@@ -409,11 +405,11 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		 !! if ml_deparcoQW > 3: act 'Rehearse for your show': gt 'music_bedroomPractice', 'rehearsing'
 
-		if sisterHere = 0 and breastpump = 1 and bp_unbox <= 0:
+		if anyaloc['inroom'] = 0 and breastpump = 1 and bp_unbox <= 0:
 			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
 		elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
 			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
-		elseif sisterHere = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
+		elseif anyaloc['inroom'] = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
 			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
 		elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 30:
 			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'

locations/city_mansion_residence_1.qsrc

@@ -1,6 +1,7 @@
 # city_mansion_residence_1
 
 if $ARGS[0] = 'yfoyer':
+	CLOSE ALL
 	$loc = 'city_mansion_residence_1'
 	$loc_arg = 'yfoyer'
 	$menu_loc = 'city_mansion_residence_1'

locations/family.qsrc

@@ -38,7 +38,6 @@ if indorf = 0:
 	sister_indorf = 0
 end
 if sisboyparty_day + 1 = daystart:sister_indorf = 0
-if sister_indorf = 1:sisterHere = 0
 *nl
 
 if StoryLine = 1:
@@ -52,24 +51,14 @@ if StoryLine = 1:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_7.jpg"></center>'
 			'You forgot to go to Rexs'' birthday party.'
-			'You brush it off thinking, <i>Oh well, hopefully he won''t be offended.</i>'
+			'You brush it off thinking, '+$OpenInnerThought+'Oh well, hopefully he won''t be offended.'+$CloseInnerThought
 			act 'Move away':gt $loc, $loc_arg
 			exit
 		end
 	end
 
-	if sister_indorf = 0:
-		if $loc = 'pav_commcenter':
-			if week < 6:
-				if hour >= 16 and hour < 18:
-					'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
-				end
-			elseif week >= 6:
-				if hour >= 11 and hour < 18:
-					'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
-				end
-			end
-		end
+	if sister_indorf = 0 and $loc = 'pav_commcenter' and anyaloc = 10:
+		'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
 	end
 
 	if indorf = 0:

locations/family_schedule.qsrc

@@ -10,141 +10,202 @@ kolloc = 0
 !!---ANYA---------------------------------------
 !! sister_indorf = 1 means Anya is in the village
 !! anyaloc['athome'] = 1 means Anya is at home, awake, and not in an event (like having sex with Roma)
+!! 
+!! unused 8, 9, 18, 19, 20, 22, 25, 27+
 if sister_indorf = 0:
 	if week <= 5:
 		if (hour < 6) or (hour = 6 and minut < 45):
 			!!Asleep
 			anyaloc = 1
-		elseif hour = 7 and minut < 15:
+			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 1
+		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
 			!!Family breakfast
 			anyaloc = 2
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 		elseif hour = 7 and minut < 30:
 			!!Helping mom clean up
 			anyaloc = 3
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 		elseif hour < 8:
 			!!In Bedroom getting ready
 			anyaloc = 4
-			sisterHere = 1
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 1
 		elseif hour = 8 and minut < 20:
 			!!Shower*
 			anyaloc = 5
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':anyaQW['bathroom_dildos'] = vanrPar_suction_dildo
 		elseif hour = 8 and minut < 30:
-			!!Walk to work
+			!!traveling
 			anyaloc = 6
 			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 0
 		elseif hour < 16:
 			!!Work
 			anyaloc = 7
 			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 0
 		elseif hour = 16 and minut < 10:
-			!!Walk home from work
-			anyaloc = 8
+			!!traveling
+			anyaloc = 6
 			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 0
 		elseif hour < 18:
-			if sisboyday + 1 = daystart:
-				!! Roma will be visiting so relaxing in bedroom
-				anyaloc = 9
-				anyaloc['athome'] = 1
+			if week = 5:
+				!!At the community center
+				anyaloc = 10
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
 			else
-				!!Personal activities: Relaxing in bedroom 9, working out at the community center 10
-				anyaloc = func('shortgs', 'rand_pick', '', 9, 10)
-				if anyaloc = 9:
+				!!Personal activities: Relaxing in bedroom 15, at the community center 10
+				anyaloc = func('shortgs', 'rand_pick', '', 10, 15)
+				if anyaloc = 15:
 					anyaloc['athome'] = 1
+					anyaloc['inroom'] = 1
 				else
 					anyaloc['athome'] = 0
+					anyaloc['inroom'] = 0
 				end
 			end
-		elseif sisboyday + 1 = daystart and hour = 18:
-			!!in bedroom with Roma
-			anyaloc = 11
+		elseif hour = 18:
+			if sisboyday + 1 = daystart:
+				!!in bedroom with Roma
+				anyaloc = 11
+				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
+			else
+				!!in bedroom hanging out
+				anyaloc = 15
+				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
+			end
 		elseif hour = 18 and minut < 30:
 			!!Family dinner
 			anyaloc = 12
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 		elseif hour < 22:
-			!!Goes out to hang out with friends 13/Roma 14 (this could be random so sometimes she stays home to give Sveta more time to talk to her 15)
-			anyaloc = func('shortgs', 'rand_pick', '', 13, 14, 15)
-			if anyaloc = 15:anyaloc['athome'] = 1
+			if week = 5:
+				!!Goes to a party
+				anyaloc = 24
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			else
+				!!Goes out to hang out with friends 13/Roma 14 (this could be random so sometimes she stays home to give Sveta more time to talk to her 15)
+				anyaloc = func('shortgs', 'rand_pick', '', 13, 14, 15)
+				if anyaloc = 15:
+					anyaloc['athome'] = 1
+					anyaloc['inroom'] = 1
+				end
+			end
 		else
-			!!In her room
-			anyaloc = 15
-			anyaloc['athome'] = 1
-			sisterHere = 1
+			if week = 5:
+				!!Goes to a party
+				anyaloc = 24
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			else
+				!!In her room
+				anyaloc = 15
+				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
+			end
 		end
 	else
-		if week = 7 and hour < 2:
+		if hour < 2:
 			!!Goes to a party
 			anyaloc = 24
 			anyaloc['athome'] = 0
-		elseif week = 7 and hour = 2 and minut < 20:
+			anyaloc['inroom'] = 0
+		elseif hour = 2 and minut < 20:
 			!!In her room drunk after party
 			anyaloc = 26
 			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 1
 		elseif hour < 9:
 			!!Asleep
 			anyaloc = 1
+			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 1
 		elseif hour = 9 and minut < 20:
 			!!Eat something in kitchen
 			anyaloc = 16
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 		elseif hour = 9 and minut < 40:
 			!!Shower*
 			anyaloc = 5
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 		elseif hour < 10:
 			!!In Bedroom
 			anyaloc = 4
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 1
 		elseif hour < 16:
 			if temp > 15 and sunWeather = 1:
 				!!On nice days goes to the beach
 				anyaloc = 17
 				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
 			else
 				!!Stays at home
-				anyaloc = 19
+				anyaloc = 15
 				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
 			end
-		elseif hour = 16 and minut < 15:
-			!!Walk to community center
-			anyaloc = 20
-			anyaloc['athome'] = 0
-		elseif hour = 17 and minut < 45:
-			!!Works out at the community center
-			anyaloc = 21
-			anyaloc['athome'] = 0
 		elseif hour < 18:
-			!!Walk home
-			anyaloc = 22
-			anyaloc['athome'] = 0
+			if week = 6:
+				!!At the community center
+				anyaloc = 10
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			else
+				!!Works out at the community center
+				anyaloc = 21
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			end
 		elseif hour = 18 and minut < 30:
-			!!Family dinner
-			anyaloc = 12
-			anyaloc['athome'] = 1
+			if week = 6
+				!!Goes to a party
+				anyaloc = 24
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			else
+				!!Family dinner
+				anyaloc = 12
+				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 0
+			end
 		elseif hour < 19:
 			if week = 7:
 				!!helps mom clean up after dinner
 				anyaloc = 23
 				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 0
 			else
 				!!Goes to a party
 				anyaloc = 24
 				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
 			end
 		else
 			if week = 7:
 				!!in her room
 				anyaloc = 15
 				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
 			else
 				!!Goes to a party
 				anyaloc = 24
 				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
 			end
 		end
 	end
@@ -160,12 +221,13 @@ if indorf = 0:
 		if hour < 5 or (hour = 5 and minut < 30):
 			!!Asleep, if Sveta knocks she''ll ask to wake Kolka
 			momloc = 1
-		elseif hour = 5 and minut < 50:
+			momloc['athome'] = 0
+		elseif hour = 5 and minut < 45:
 			!!shower
 			momloc = 2
 			momloc['athome'] = 1
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':gs'mother_sextalk','discover_dildo'
-		elseif hour < 6 or (hour = 6 and minut < 10):
+		elseif hour < 6:
 			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
 			momloc = 3
 			momloc['athome'] = 1
@@ -178,7 +240,7 @@ if indorf = 0:
 			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 and minut > 45) or (hour = 7 and minut < 15):
 				!! Family breakfast
 				momloc['kitchen_action'] = 3
 			else
@@ -194,7 +256,7 @@ if indorf = 0:
 			!!Working in the cafe. On Friday she stays until 17:50
 			momloc = 9
 			momloc['athome'] = 0
-		elseif hour = 16 and minut < 40 and week < 5:
+		elseif hour = 16 and minut < 50 and week < 5:
 			!!Buying groceries for dinner and other stuff needed for home at the supermarket
 			momloc = 7
 			momloc['athome'] = 0
@@ -210,6 +272,10 @@ 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:
+			!!Family dinner
+			momloc = 12
+			momloc['athome'] = 1
 		elseif hour < 19:
 			!! Cleaning dinner table/Doing dishes
 			momloc = 13
@@ -244,12 +310,12 @@ if indorf = 0:
 		if hour < 5 or (hour = 5 and minut < 30):
 			!! Sleep
 			momloc = 1
-		elseif hour = 5 and minut < 50:
+		elseif hour = 5 and minut < 45:
 			!! Shower, if Sveta knocks she''ll ask to wake Kolka
 			momloc = 2
 			momloc['athome'] = 1
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':gs'mother_sextalk','discover_dildo'
-		elseif hour < 6 or (hour = 6 and minut < 10):
+		elseif hour < 6:
 			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
 			momloc = 3
 			momloc['athome'] = 1
@@ -274,7 +340,7 @@ if indorf = 0:
 			momloc = momclean1
 			momloc['athome'] = 1
 		elseif hour = 11 and minut < 30:
-			!! Takes the car to town/walks to church
+			!!Traveling - takes the car to town/walks to church
 			momloc = 14
 			momloc['athome'] = 0
 		elseif hour < 12 or (hour = 12 and minut < 30):
@@ -302,7 +368,7 @@ if indorf = 0:
 			momloc = 11
 			momloc['athome'] = 1
 		elseif hour = 18 and minut < 30:
-			!!Family dinner (same as the family breakfast, Sveta doesn''t have to join it but we can have some family interactions like mom and step dad asking about how school was etc)
+			!!Family dinner
 			momloc = 12
 			momloc['athome'] = 1
 		elseif hour < 19:
@@ -310,12 +376,14 @@ if indorf = 0:
 			momloc = 13
 			momloc['athome'] = 1
 		elseif hour < 21:
-			!!Says she goes to see her sister, in reality sometimes see''s her sister of fucks around with different people. - Sunday goes to evening mass
+			!!Says she goes to see her sister, in reality sometimes sees her sister or fucks around with different people. - Sunday goes to evening mass
 			momloc['athome'] = 0
-			if week = 5:
+			if week = 6:
+				!!Slutting around?
 				momloc = 17
 			else
-				momloc = 18
+				!!Church - Mass
+				momloc = 16
 			end
 		elseif hour < 22:
 			!! Watches TV with Vladimir
@@ -337,11 +405,11 @@ if indorf = 0:
 			!! Sleep
 			sdadloc = 1
 			sdadloc['athome'] = 0
-		elseif hour < 7:
+		elseif hour < hour = 6 and minut < 45:
 			!!Getting ready, sometimes has quicky
 			sdadloc = 2
 			sdadloc['athome'] = 1
-		elseif hour = 7 and minut < 30:
+		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
 			!!family breakfast
 			sdadloc = 3
 			sdadloc['athome'] = 1
@@ -405,11 +473,11 @@ if indorf = 0:
 			!! Sleep
 			sdadloc = 1
 			sdadloc['athome'] = 0
-		elseif hour < 7:
+		elseif hour < hour = 6 and minut < 45:
 			!!Getting ready
 			sdadloc = 2
 			sdadloc['athome'] = 1
-		elseif hour = 7 and minut < 30:
+		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
 			!!family breakfast
 			sdadloc = 3
 			sdadloc['athome'] = 1
@@ -476,7 +544,7 @@ if indorf = 0:
 				kolloc = 2
 				kolloc['athome'] = 1
 			end
-		elseif hour = 7 and minut < 15:
+		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
 			!! Family Breakfast
 			kolloc = 3
 			kolloc['athome'] = 1
@@ -540,7 +608,7 @@ if indorf = 0:
 				kolloc = 2
 				kolloc['athome'] = 1
 			end
-		elseif hour = 7 and minut < 15:
+		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
 			!! Family Breakfast
 			kolloc = 3
 			kolloc['athome'] = 1

locations/food.qsrc

@@ -522,7 +522,7 @@ end
 if $ARGS[0] = 'snack':
 	*clr & cla
 	gs 'stat'
-	minut += 15
+	minut += 5
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	pcs_mood += 20
@@ -546,7 +546,7 @@ end
 if $ARGS[0] = 'f_food':
 	*clr & cla
 	frost = 0
-	minut += 20
+	minut += 10
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	fat += 14
@@ -575,7 +575,7 @@ end
 if $ARGS[0] = 's_meal':
 	*clr & cla
 	frost = 0
-	minut += 25
+	minut += 10
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	fat += 4
@@ -604,7 +604,7 @@ end
 if $ARGS[0] = 'm_meal':
 	*clr & cla
 	frost = 0
-	minut += 30
+	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	fat += 8
@@ -871,21 +871,6 @@ if $ARGS[0] = 'family_meals':
 	pcs_breath = 0
 end
 
-if $ARGS[0] = 'breakfast':
-	frost = 0
-	pcs_health += 10
-	pcs_mood += 10
-	pcs_energy += 60
-	if pcs_hydra >= 100:
-		pcs_hydra += 30
-	else
-		pcs_hydra += 60
-	end
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
-end
-
 if $ARGS[0] = 'aftermeal':
 
 	if pcs_energy > 100:

locations/gkafe.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = '':
 
 	act 'Leave':gt 'pav_market'
 
-	if momloc = 9 and hour = 16 and indorf = 0 and mother_go = 1:
+	if (momloc = 7 or momloc = 9) and hour = 16 and indorf = 0 and mother_go = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
 		*nl

locations/kuhrPar.qsrc

@@ -50,9 +50,9 @@ if momloc = 4:
 	end
 end
 
-if hour = 7 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 = 7 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 ! 25:
 	'<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.'
@@ -115,7 +115,7 @@ if hour = 7 and breakfast_day ! daystart and indorf = 0:
 	end
 elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0: 
 	if PCloswimwear ! 1 and $clothingworntype ! 'nude':
-		act 'Eat dinner with your family': 
+		act 'Eat dinner with your family (0:20)': 
 			*clr & cla
 			gs 'food', 'family_meals', 'dinner'
 			npc_rel['A29'] += 1
@@ -159,13 +159,11 @@ elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0:
 	end
 else
 	if (hour = 8 or (hour = 7 and indorf = 1)) and breakfast_day ! daystart:
-		act 'Eat breakfast alone':
+		act 'Eat breakfast alone (0:20)':
 			*clr & cla
 			menu_off = 1
 			breakfast_day = daystart
 			gs 'food', 'family_meals', 'breakfast'
-			!!the line above adds 20mins so correction for it below
-			minut -= 5
 			gs 'stat'			
 			'<center><img <<$set_imgh>> src="images/shared/food/breakfast_'+rand(0,1)+'.jpg"></center>'
 			'You enjoy a quiet breakfast by yourself. The portions were moderate and <<$mtxt>>. You accompany it with a mug of tea.'
@@ -173,9 +171,9 @@ else
 			act 'Get up from the table': gt $loc, $loc_arg
 		end
 	end
-	act 'Eat a full meal (0:30)':gs 'food', 'm_meal'
-	act 'Eat a light meal (0:25)':gs 'food', 's_meal'
-	act 'Have a snack (0:15)':gs 'food', 'snack'
+	act 'Eat a full meal (0:20)':gs 'food', 'm_meal'
+	act 'Eat a light meal (0:10)':gs 'food', 's_meal'
+	act 'Have a snack (0:05)':gs 'food', 'snack'
 end
 
 dynamic $sandwich

locations/selfplay.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 
 	if sisboytrio > 0 and sis_watch = 0 and $loc = 'bedrPar':
 		sis_watch = 1
-		if sisterHere > 0:sis_watch = 2 & 'Anya smiles and lets you carry on.'
+		if anyaloc['inroom'] = 1:sis_watch = 2 & 'Anya smiles and lets you carry on.'
 	end
 
 	!!then the calculation invasion
@@ -904,13 +904,13 @@ if $ARGS[0] = 'sis_prov':
 
 	$AnyaMsg = ''
 
-	if $loc = 'bedrPar' and (hour >= 7 or hour < 23):
+	if $loc = 'bedrPar':
 		gs 'family'
 
 		if sister_indorf = 0:
-			if sisterHere = 0 and proverkasisterhere = 0:proverkasisterhere = 1
+			if anyaloc['inroom'] = 0 and proverkasisterhere = 0:proverkasisterhere = 1
 
-			if sisterHere > 0:
+			if anyaloc['inroom'] = 1:
 				cls
 				if sisboytrio > 0 and sis_watch = 1:
 					sis_watch = 2

locations/shop.qsrc

@@ -44,7 +44,7 @@ if $shoplocation = 'main':
 	
 	!! The store in the town and in the altstart only
 	if $loc = 'pav_commercial' and StoryLine = 1:
-		if week < 6 and hour >= 8 and hour < 16:
+		if anyaloc = 7:
 			*nl
 			'Your sister <a href="exec:$shoplocation = ''Anya'' & gt ''shop'', ''move''">Anya</a> is sitting at the cash register.'
 		end

locations/sister_chat.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = 'checks':
 				gs 'stat'
 				narkossister = 0
 				*nl
-				'You tell yourself, "Come on <<$pcs_nickname>>, deep breath, focus. You can do this."'
+				'You tell yourself, '+$OpenInnerThought+'"Come on <<$pcs_nickname>>, deep breath, focus. You can do this."'+$CloseInnerThought
 				'You feel your head is clear enough to talk to your sister once more.'
 				act 'Chat': gt 'sister_chat', 'sister_chat'
 			end
@@ -138,7 +138,7 @@ $narkosisterspalila = {
 	gs 'stat'
 	!'sister slept on drugs.'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-	'"Come on <<$pcs_firstname>>, keep it together! Act sober," you think to yourself. "I just have to talk normally and not think about it."'
+	+$OpenInnerThought+'"Come on <<$pcs_firstname>>, keep it together! Act sober,"'+$CloseInnerThought+' you think to yourself. '+$OpenInnerThought+'"I just have to talk normally and not think about it."'+$CloseInnerThought
 	'Your sister looks at you, her eyebrow raised. "Are you stoned <<$pcs_nickname>>?"'
 	act 'No':
 		cla
@@ -335,9 +335,7 @@ if $ARGS[0] = 'sister_chat':
 				sisterQW['party'] = 1
 				if sisterQW['rexbday'] = 0: sisterQW['rexbday'] = 1
 				*clr & cla
-				!! Sicaa: This image seems wrong, given that doing anything lesbian with your sister is no longer necessary for the party. Changing it to a different picture as a temporary measure
-				!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_2.jpg"></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_03.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big33.jpg"></center>'
 				'You agree to go to the party.'
 				'"Awesome <<$pcs_nickname>>, it''ll be fun! We will meet at the community center this Friday. Don''t forget to be there before 18:00, otherwise we will leave without you."'
 				'With these words, your sister hugs you and kisses you on the cheek.'
@@ -489,7 +487,6 @@ if $ARGS[0] = 'sister_chat':
 		elseif npc_rel['A33'] < 20:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
 			'You try to talk to your sister, but she refuses to talk to you.'
-	!!what is this sistersorry used for? can we get rid of it and just always have the say sorry as a option?
 			if sisterQW['lowrelboost'] ! daystart:
 				act 'Apologize':
 					*clr & cla
@@ -621,7 +618,7 @@ if $ARGS[0] = 'sister_chat':
 				if temp = 1:
 					'As you chat with your sister, she says it is possible to rent an apartment in the city and live and work there, but she is happy living in Pavlovsk. Even helping pay the bills, she has way more money to spend on herself this way.'	
 				elseif temp = 2:
-					'You chat with your sister. She tells you the tailor at the garment factory is a creep who makes his customers wait around in their underwear. At least the pretty girls that is.'
+					'You chat with your sister. She tells you the tailor at the garment factory is a creep who makes his customers wait around in their underwear. At least the pretty girls, that is.'
 				elseif temp = 3:
 					'You ask Anya about the University, and she grins. "I almost went, passed the entrance exam. However, I started working in the summer and got used to having cash. What can I buy with a diploma?"'
 				elseif temp = 4:
@@ -659,7 +656,7 @@ if $ARGS[0] = 'sister_chat':
 			if $loc ! 'kuhrPar' and npc_rel['A33'] >= 70:
 				act 'Talk about sex':
 					*clr & cla
-					pcs_horny += RAND(5,10)
+					pcs_horny += rand (5,10)
 					gs 'stat'
 					temp = rand (1,8)
 					if temp = 1:
@@ -789,7 +786,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Tell her you want to have sex':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
-						if hour > 6 and hour < 23:
+						if hour > 6 and hour < 22:
 							'You crawl over her bed towards her to kiss her, but when she realizes what you are about to do, she pulls back from you. "What are you doing? Everyone is still up. What if someone walked in?" She shakes her head. "You really need to control yourself little sister." She makes it clear nothing is going to happen.'
 							act 'Move away': gt $loc, $loc_arg
 							act 'Keep talking': gt 'sister_chat', 'sister_chat'
@@ -798,7 +795,7 @@ if $ARGS[0] = 'sister_chat':
 							'You grin at her. "Come on, it will be fun."'
 							gs 'arousal', 'kiss', 3, 'incest', 'lesbian'
 							gs 'stat'
-							if rand(1,3) = 1:
+							if rand(1,5) < 3:
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_05.jpg"></center>'
 								'Anya says, "Again? You know I enjoy this, but I''m not a lesbian, and we should only do it... occasionally... okay?"'
@@ -1271,9 +1268,9 @@ if $ARGS[0] = 'bathroom_dildo_talk1':
 		'<center><h1><font color="maroon">Anya</font></h1></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
 		if anyaQW['bathroom_dildos'] = 1:
-			'"I found that that stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know it''s not mine and I don''t think Kolka''s into that kind of thing so I assumed it must be yours. Don''t leave that laying around! If mom found it, she''d have beat your ass!"'
+			'"I found that that stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know it''s not mine and I don''t think Kolka''s into that kind of thing, so I assume it must be yours. Don''t leave that laying around! If mom found it, she''d have beat your ass!"'
 		else
-			'"I found those stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know they''re not mine and I don''t think Kolka''s into that kind of thing so I assumed they must be yours. Don''t leave those around! If mom found them, she''d have beat your ass!"'
+			'"I found those stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know they''re not mine and I don''t think Kolka''s into that kind of thing, so I assume they must be yours. Don''t leave those around! If mom found them, she''d have beat your ass!"'
 		end
 		act'Continue':gt'bedrPar'
 	end