[changed] Migrated the schedules of anybody not in it to the schedule array locat['name']

locations/Komp.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'start':
 	act 'Play Solitaire (0:20)':gt 'komp', 'pasians'
 	
 	if AlbinaQW['flashdrive'] = 1:
-		if $loc = 'dachain' or $loc = 'sitr' or $loc = 'bedr' or $loc = 'bedr2x' or ($loc = 'uni_dorm' and $loc_arg = 'dorm_room') or ($loc = 'city_mansion_residence_2' and $loc_arg = 'yoffice') or ($loc = 'pav_shared_apt' and $loc_arg = 'pcsRoom') or ($loc = 'mey_home' and $loc_arg = '3') or ($loc = 'city_house_res_misc' and $loc_arg = 'livroom') or $loc = 'nichBedroomServant' or (anyaloc['inroom'] = 0 and $loc = 'bedrPar'):
+		if $loc = 'dachain' or $loc = 'sitr' or $loc = 'bedr' or $loc = 'bedr2x' or ($loc = 'uni_dorm' and $loc_arg = 'dorm_room') or ($loc = 'city_mansion_residence_2' and $loc_arg = 'yoffice') or ($loc = 'pav_shared_apt' and $loc_arg = 'pcsRoom') or ($loc = 'mey_home' and $loc_arg = '3') or ($loc = 'city_house_res_misc' and $loc_arg = 'livroom') or $loc = 'nichBedroomServant' or (locat['Anya_inroom'] = 0 and $loc = 'bedrPar'):
 			act 'Check Albina''s flash drive': gt 'albina_house_events', 'flash_drive'
 		end
 	end
@@ -144,7 +144,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 anyaloc['inroom'] = 1 and sisboytrio = 0 and $loc = 'bedrPar':
+	elseif locat['Anya_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!'
 
@@ -598,7 +598,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 anyaloc['inroom'] = 0 or $loc ! 'bedrPar':
+	elseif locat['Anya_inroom'] = 0 or $loc ! 'bedrPar':
 		act 'Go to your MFC homepage':
 			*clr & cla
 			minut += 2
@@ -618,7 +618,7 @@ if $ARGS[0] = 'mfc':
 			gs 'stat'
 			gt 'komp','brows'
 		end
-	elseif anyaloc['inroom'] = 1 and $loc = 'bedrPar':
+	elseif locat['Anya_inroom'] = 1 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 anyaloc['inroom'] = 1 and $loc = 'bedrPar':
+	if locat['Anya_inroom'] = 1 and $loc = 'bedrPar':
 		*clr & cla
 		topmfc = 1
 		backmfc = 1

locations/LariskaHome.qsrc

@@ -1,5 +1,6 @@
 # LariskaHome
-!2021/05/02
+!! 2022/06/04 - Alaratt
+
 if $ARGS[0] = 'front_door':
 	menu_off = 1
 	$loc_arg = 'front_door'
@@ -14,7 +15,7 @@ if $ARGS[0] = 'front_door':
 	gs 'lariska_schedule'
 
 	if frost > 0: frost = 0
-	if lariloc['athome'] = 1:
+	if locat['Lari_athome'] = 1:
 		if week <= 5:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 			'You knock on Lariska''s apartment door.'
@@ -23,15 +24,15 @@ if $ARGS[0] = 'front_door':
 			act 'Enter the apartment':gt 'LariskaHome', 'hallway'
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariskamother.jpg"></center>'
-			if lariloc = 2 or lariloc = 8 or lariloc = 15 or lariloc = 22:
+			if locat['Lariska'] = 2 or locat['Lariska'] = 8 or locat['Lariska'] = 15 or locat['Lariska'] = 22:
 				$text_home = 'Lariska is in her room.'
-			elseif lariloc = 3 or lariloc = 19 or lariloc = 12:
+			elseif locat['Lariska'] = 3 or locat['Lariska'] = 19 or locat['Lariska'] = 12:
 				$text_home = 'Lariska is in the kitchen.'
-			elseif lariloc = 13:
+			elseif locat['Lariska'] = 13:
 				$text_home = 'Lariska is in the shower. She should be out soon.'
-			elseif lariloc = 20:
+			elseif locat['Lariska'] = 20:
 				$text_home = 'Lariska is cleaning in the bathroom.'
-			elseif lariloc = 14 or lariloc = 16 or lariloc = 18:
+			elseif locat['Lariska'] = 14 or locat['Lariska'] = 16 or locat['Lariska'] = 18:
 				$text_home = 'Lariska is in the living room.'
 			else
 				$text_home = 'Lariska is around here somewhere.'
@@ -51,21 +52,21 @@ if $ARGS[0] = 'front_door':
 			act 'Enter the apartment':gt 'LariskaHome', 'hallway'
 		end
 	else
-		if lariloc = 9:
+		if locat['Lariska'] = 9:
 			$text_home = 'Lariska is at the Community Center around this time.'
-		elseif lariloc = 6:
+		elseif locat['Lariska'] = 6:
 			$text_home = 'Lariska is at cheerleading practice right now.'
-		elseif lariloc = 7:
+		elseif locat['Lariska'] = 7:
 			$text_home = 'Lariska is a cheerleader, so she is at the friday game.'
-		elseif lariloc = 5 or lariloc = 4:
+		elseif locat['Lariska'] = 5 or locat['Lariska'] = 4:
 			$text_home = 'Lariska is at school right now.'
-		elseif lariloc = 21:
+		elseif locat['Lariska'] = 21:
 			$text_home = 'Lariska is at the volleyball game.'
-		elseif lariloc = 1:
+		elseif locat['Lariska'] = 1:
 			$text_home = 'Lariska is asleep right now. She should be up around 9am.'
-		elseif lariloc = 13:
+		elseif locat['Lariska'] = 13:
 			$text_home = 'Lariska is unable to answer the door right now.'
-		elseif lariloc = 15:
+		elseif locat['Lariska'] = 15:
 			$text_home = 'Lariska is in bed about this time.'
 		else
 			$text_home = 'I am not sure where Lariska is right now.'
@@ -107,15 +108,15 @@ if $ARGS[0] = 'hallway':
 	'<center><b><font color="DeepSkyBlue">Hallway</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/home_1.jpg"></center>'
 	'You stand in the main hallway of the japanese styled apartment. Everything looks clean, and the air smells nice.'
-	if lariloc = 1 or lariloc = 2 or lariloc = 8 or lariloc = 15 or lariloc = 22:
+	if locat['Lariska'] = 1 or locat['Lariska'] = 2 or locat['Lariska'] = 8 or locat['Lariska'] = 15 or locat['Lariska'] = 22:
 		$text_home = 'is in her bedroom'
-	elseif lariloc = 3 or lariloc = 19 or lariloc = 12 or lariloc = 11:
+	elseif locat['Lariska'] = 3 or locat['Lariska'] = 19 or locat['Lariska'] = 12 or locat['Lariska'] = 11:
 		$text_home = 'is in the kitchen'
-	elseif lariloc = 13:
+	elseif locat['Lariska'] = 13:
 		$text_home = 'is in the shower'
-	elseif lariloc = 8:
+	elseif locat['Lariska'] = 8:
 		$text_home = 'is in the bathroom, cleaning'
-	elseif lariloc = 14 or lariloc = 16 or lariloc = 18:
+	elseif locat['Lariska'] = 14 or locat['Lariska'] = 16 or locat['Lariska'] = 18:
 		$text_home = 'should be in the living room'
 	else
 		$text_home = 'is no longer home.'
@@ -147,9 +148,9 @@ if $ARGS[0] = 'livingroom':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_livingroom.jpg"></center>'
 	'A spacious room with a comfy looking couch and a nice tv hanging on the wall. Various plants adorn the room.'
 	*nl
-	if lariloc = 14:'<a href="exec: gt ''LariskaHome'', ''livingroom_tv_1''">Lariska</a> is curled up on the couch, watching tv.'
-	if lariloc = 16:'<a href="exec: gt ''LariskaHome'', ''livingroom_exercise_1''">Lariska</a> is here working out.'
-	if lariloc = 18:'You see <a href="exec: gt ''LariskaHome'', ''livingroom_clean_1''">Lariska</a> cleaning.'
+	if locat['Lariska'] = 14:'<a href="exec: gt ''LariskaHome'', ''livingroom_tv_1''">Lariska</a> is curled up on the couch, watching tv.'
+	if locat['Lariska'] = 16:'<a href="exec: gt ''LariskaHome'', ''livingroom_exercise_1''">Lariska</a> is here working out.'
+	if locat['Lariska'] = 18:'You see <a href="exec: gt ''LariskaHome'', ''livingroom_clean_1''">Lariska</a> cleaning.'
 	act 'Return to the hallway':gt 'LariskaHome', 'hallway'
 end
 
@@ -211,16 +212,16 @@ if $ARGS[0] = 'kitchen':
 	else
 		'Like your <<$npc_nickname[''A29'']>> does at home, somebody living here makes large batches of food, ready to eat anytime. You don''t feel comfortable eating a full meal uninvited, but you know nobody will mind if you just have a snack.'
 	end
-	if lariloc = 3:'Have <a href="exec: gt ''LariskaHome'', ''kitchen_meal_1''">breakfast</a> with Lariska.'
-	if lariloc = 11:
+	if locat['Lariska'] = 3:'Have <a href="exec: gt ''LariskaHome'', ''kitchen_meal_1''">breakfast</a> with Lariska.'
+	if locat['Lariska'] = 11:
 		if LariskaQW['story'] = 11 and week < 6 and LariskaBoyDay <= daystart:
 			'<a href="exec: gt ''lariska_storyline'', ''Boyfriend_2''">Lariska</a> is cooking dinner.'
 		else
 			'<a href="exec: gt ''LariskaHome'', ''kitchen_cooking_1''">Lariska</a> is cooking dinner.'
 		end
 	end
-	if lariloc = 12:'Have <a href="exec: gt ''LariskaHome'', ''kitchen_meal_1''">dinner</a> with Lariska.'
-	if lariloc = 19:'<a href="exec: gt ''LariskaHome'', ''kitchen_cleaning_1''">Lariska</a> is here cleaning.'
+	if locat['Lariska'] = 12:'Have <a href="exec: gt ''LariskaHome'', ''kitchen_meal_1''">dinner</a> with Lariska.'
+	if locat['Lariska'] = 19:'<a href="exec: gt ''LariskaHome'', ''kitchen_cleaning_1''">Lariska</a> is here cleaning.'
 	act 'Return to the hallway':gt 'LariskaHome', 'hallway'
 	if lariskalove >= 6:
 		act 'Eat a hearty meal (0:20)':gs 'food', 'l_meal'
@@ -308,10 +309,10 @@ if $ARGS[0] = 'bathroom':
 	'The room is clean, and even smells like sage.'
 	*nl
 	'There is a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a separate bath tub.'
-	if lariloc = 13:'Since <a href="exec: gt ''LariskaHome'', ''bathroom_join_1''">Lariska</a> didn''t lock the door, you are able to enter unnoticed. Maybe you can join her...'
-	if lariloc = 20:'<a href="exec: gt ''LariskaHome'', ''bathroom_cleaning_1''">Lariska</a> is here, cleaning the bathroom.'
+	if locat['Lariska'] = 13:'Since <a href="exec: gt ''LariskaHome'', ''bathroom_join_1''">Lariska</a> didn''t lock the door, you are able to enter unnoticed. Maybe you can join her...'
+	if locat['Lariska'] = 20:'<a href="exec: gt ''LariskaHome'', ''bathroom_cleaning_1''">Lariska</a> is here, cleaning the bathroom.'
 	act 'Return to the hallway':gt 'LariskaHome', 'hallway'
-	if lariloc ! 13:
+	if locat['Lariska'] ! 13:
 		gs 'din_van', 'private'
 		gs 'din_van', 'prvt_pee'
 	end
@@ -481,21 +482,21 @@ if $ARGS[0] = 'lariska_bedroom':
 	end
 	'<table><tr><td valign="top">Your <a href="exec:gt ''budilnik'', ''start''">phone alarm</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 	*nl
-	if lariloc = 1:'<a href="exec:gt ''LariskaHome'', ''lariska_asleep_1''">Lariska</a> is sound asleep, curled up and wrapped in blankets.'
-	if lariloc = 2:'<a href="exec:gt ''LariskaHome'', ''lariska_dressing_1''">Lariska</a> is getting dressed right now.'
-	if lariloc = 8:'Lariska is doing on her school work.'
-	if lariloc = 15:'<a href="exec:gt ''LariskaHome'', ''lariska_reading_1''">Lariska</a> is reading in bed.'
-	if lariloc = 17:'<a href="exec:gt ''LariskaHome'', ''lariska_cleaning_1''">Lariska</a> is here cleaning.'
-	if lariloc = 22:'Lariska is here, doing various things.'
-	if lariloc = 9:gt 'LariskaHome', 'community_center_invite'
+	if locat['Lariska'] = 1:'<a href="exec:gt ''LariskaHome'', ''lariska_asleep_1''">Lariska</a> is sound asleep, curled up and wrapped in blankets.'
+	if locat['Lariska'] = 2:'<a href="exec:gt ''LariskaHome'', ''lariska_dressing_1''">Lariska</a> is getting dressed right now.'
+	if locat['Lariska'] = 8:'Lariska is doing on her school work.'
+	if locat['Lariska'] = 15:'<a href="exec:gt ''LariskaHome'', ''lariska_reading_1''">Lariska</a> is reading in bed.'
+	if locat['Lariska'] = 17:'<a href="exec:gt ''LariskaHome'', ''lariska_cleaning_1''">Lariska</a> is here cleaning.'
+	if locat['Lariska'] = 22:'Lariska is here, doing various things.'
+	if locat['Lariska'] = 9:gt 'LariskaHome', 'community_center_invite'
 	act 'Return to the hallway':gt 'LariskaHome', 'hallway'
-	if lariloc = 2 or lariloc = 8 or lariloc = 22 or lariloc = 15 or lariloc = 17:
+	if locat['Lariska'] = 2 or locat['Lariska'] = 8 or locat['Lariska'] = 22 or locat['Lariska'] = 15 or locat['Lariska'] = 17:
 		act 'Chat with Lariska': gt 'LariskaHome', 'chat'
 	end
 	if lernHome > 0:
 		act 'Do homework':gt 'LariskaHome','homework'
 	end
-	if lariskaTrain > 5 and LariskaQW['volleyball'] = 0 and (lariloc = 8 or (lariloc = 22 and hour < 16 and week <= 5)):
+	if lariskaTrain > 5 and LariskaQW['volleyball'] = 0 and (locat['Lariska'] = 8 or (locat['Lariska'] = 22 and hour < 16 and week <= 5)):
 		act 'Talk to Lariska about becoming a pro volleyball player':
 			cls
 			minut += 5
@@ -522,7 +523,7 @@ if $ARGS[0] = 'lariska_bedroom':
 			end
 		end
 	end
-	if lariskaroomfun ! daystart and LariskaQW['story'] >= 8 and npc_rel['A13'] >= 80 and (lariloc = 2 or lariloc = 8 or lariloc = 22 or lariloc = 15 or lariloc = 17):
+	if lariskaroomfun ! daystart and LariskaQW['story'] >= 8 and npc_rel['A13'] >= 80 and (locat['Lariska'] = 2 or locat['Lariska'] = 8 or locat['Lariska'] = 22 or locat['Lariska'] = 15 or locat['Lariska'] = 17):
 		act 'Flirt with her':
 			*clr & cla
 			menu_off = 1

locations/bed2.qsrc

@@ -142,7 +142,7 @@ if $ARGS[0] = '':
 	gs 'events', 'read'
 
 	if $loc = 'bedrPar':
-		if anyaloc['inroom'] = 0 or anyaloc = 1 or anyaloc = 26:
+		if locat['Anya_inroom'] = 0 or locat['Anya'] = 1 or locat['Anya'] = 26:
 			if pornMagazine > 0:gs 'events', 'read_porn'
 			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':

locations/bedrPar.qsrc

@@ -16,7 +16,7 @@ gs 'themes', 'indoors'
 gs 'family_schedule'
 
 if $ARGS[0] = '' or $ARGS[0] = 'start':
-	if momloc = 26 and fromoutside:
+	if locat['Mother'] = 26 and fromoutside:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		if prezik > 0 and rand(1,3) = 1:
 			gt 'mother', 'condom_find'
@@ -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 anyaloc['inroom'] = 0:
+	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and locat['Anya_inroom'] = 0:
 		gt 'tobiQW', 'start'
 		
-	elseif anyaloc = 11: 
+	elseif locat['Anya'] = 11: 
 		gt 'sisterQW', 'sisboyQW_expel'
 		
-	elseif anyaloc['inroom'] = 1 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
+	elseif locat['Anya_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>'
@@ -153,15 +153,15 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			else
 				sisterdialog = 1
 
-				if anyaloc = 1:
+				if locat['Anya'] = 1:
 					'<a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
-				elseif anyaloc = 4:
+				elseif locat['Anya'] = 4:
 					sisterdialog = 3
 					'<a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
-				elseif anyaloc = 15:
+				elseif locat['Anya'] = 15:
 					if anyaQW['bathroom_dildos'] > 0:gt'sister_chat','bathroom_dildo_talk1'
 					'<a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
-				elseif anyaloc = 26:
+				elseif locat['Anya'] = 26:
 					if sisboypartyQW = 1: sisboypartyQW = 2
 					if sisboyparty = -1: sisboyparty = 1
 					'A drunken Anya is sound asleep in her bed.'
@@ -170,7 +170,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		end
 
 		act 'Exit the room':
-			if (anyaloc = 4 or anyaloc = 15) and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
+			if (locat['Anya'] = 4 or locat['Anya'] = 15) and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
 			gt 'korrPar'
 		end
 		
@@ -180,7 +180,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 anyaloc['inroom'] = 0 or sisboytrio > 0:
+		if locat['Anya_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'
@@ -197,7 +197,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 anyaloc['inroom'] = 0: dynamic $palelady
+		if locat['Anya_inroom'] = 0: dynamic $palelady
 
 		gs 'exercise', 'start'
 
@@ -308,7 +308,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 anyaloc['inroom'] = 1 and pcs_inhib < 30:
+				if locat['Anya_inroom'] = 1 and pcs_inhib < 30:
 					if pcs_inhib < 10:
 						$diff = 'hard'
 					elseif pcs_inhib < 20:
@@ -334,7 +334,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			!! Streaming music
-			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:
+			if ml_guitar['hasguitar'] = 1 and locat['Anya_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:
@@ -403,11 +403,11 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		 !! if ml_deparcoQW > 3: act 'Rehearse for your show': gt 'music_bedroomPractice', 'rehearsing'
 
-		if anyaloc['inroom'] = 0 and breastpump = 1 and bp_unbox <= 0:
+		if locat['Anya_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 anyaloc['inroom'] = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
+		elseif locat['Anya_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/bedrPar2.qsrc

@@ -81,7 +81,7 @@ end
 
 if $ARGS[0] = 'wardrobe_search':
 	*clr & cla
-	if indorf = 0 and (momloc = 1 or momloc = 3 or sdadloc = 1 or sdadloc = 2):
+	if indorf = 0 and (locat['Mother'] = 1 or locat['Mother'] = 3 or locat['Stepdad'] = 1 or locat['Stepdad'] = 2):
 		'What are you thinking? You can''t go through the wardrobe while your parents are in the room!'
 		act 'Leave ': gt $loc, $loc_arg
 		exit

locations/brother.qsrc

@@ -2,7 +2,7 @@
 
 brotherAge = year - ((npc_dob['A34'] - (npc_dob['A34'] mod 10000)) / 10000)
 
-!! This is a temporary patch!
+
 BrotherHappy = 1
 gs 'family_schedule'
 
@@ -26,7 +26,7 @@ if npc_QW['A34'] > 20 and npc_QW['A34'] < 25: npc_QW['A34'] = 20
 !! brotherSex = 9 - You are siblings with benefits
 !! brotherSex = 10 - You are lovers
 !! npc_QW['A34']: Quest stages
-!! brotherAge: your age - 2
+!! brotherAge: your age - 1
 !! brotherknowslut: brother knowledge of your sexual activity (1 = seen cum, 2 = groupsex in park)
 !! npc_pregtalk['A34']: Flag 0/1 Do your brother know you are pregnant
 !! brotherDay:
@@ -79,7 +79,7 @@ if $ARGS[0] = 'start':
 	act 'Leave':gt $loc, $loc_arg
 
 	*nl
-	if kolloc = 7 or kolloc = 11:
+	if locat['Kolka'] = 7 or locat['Kolka'] = 11:
 		! WD: Fix old nude variable
 		if (cumloc[1] > 0 or cumloc[4] > 0 or cumloc[8] > 0 or cumloc[9] > 0 or cumloc[10] > 0 or cumloc[14] > 0 or cumloc[15] > 0) and $clothingworntype = 'nude':
 			if $pantyworntype = 'none' and cumloc[1] = 1:
@@ -180,21 +180,17 @@ if $ARGS[0] = 'start':
 					playfootball = 0
 					gt 'brother', 'playfootball'
 				end
-				!if brotherSex >= 5:
-				!	act'Ask him if he wants to sneak off to fool around':
-				!end
 			end
 		end
 	end
 
 	if $loc = 'sitrPar' or ($loc = 'family' and $loc_arg = 'sofa'):
-		if kolloc = 11 or kolloc = 2:
+		if locat['Kolka'] = 11 or locat['Kolka'] = 2:
 			act'Chat with Kolka':gt 'brother2', 'chat'
-			!!act'Banter with Kolka':gt'brother2','banter'
-			if sdadloc ! 10 and momloc ! 19 and momloc ! 24:
+			if locat['Stepdad'] ! 10 and locat['Mother'] ! 19 and locat['Mother'] ! 24:
 				if brotherSex < 5 and brotherkiss >= 1 and brotherkisstalk < 1:
 					act'Talk about the kiss':gt 'brother', 'kiss_talk'
-				elseif brotherkisstalk = 1 or brotherSex > 4 and momloc ! 19:
+				elseif brotherkisstalk = 1 or brotherSex > 4 and locat['Mother'] ! 19:
 					act'Make out with your brother':gt 'brother2', 'kiss'
 				end
 				if NatbelQW['KolkaTease'] = 1:
@@ -202,17 +198,13 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-
-		!if sdadloc ! 10 and hour >= 7:
-		!	act'Play video games with him':gt'video_games','brother'
-		!end
 	end
 
 	if $loc = 'sitrPar':
 		if npc_pregtalk['A34'] = 0: gs 'brother', 'pregreact'
 		gs 'brother', 'brotherSexCount'
 
-		if indorf = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and sdadloc ! 10 and npc_rel['A34'] > 85 and hour >= 18 and hour < 23 and pirsF > 0:
+		if indorf = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and locat['Stepdad'] ! 10 and npc_rel['A34'] > 85 and hour >= 18 and hour < 23 and pirsF > 0:
 			act 'Show off your nipple piercings':
 				*clr & cla
 				gs 'stat'
@@ -255,14 +247,14 @@ if $ARGS[0] = 'start':
 					exit
 				end
 			else
-				if sdadloc ! 10 and hour >= 18 and hour < 23:
+				if locat['Stepdad'] ! 10 and hour >= 18 and hour < 23:
 					'"How lovely," Kolka says as he plays with your pierced nipples.'
 					npc_rel['A34'] += 3
 					brothersawpirsF = 1
 					pcs_horny += 10
 					act 'Leave':gt 'sitrPar'
 					exit
-				elseif sdadloc = 10 and hour >= 18 and hour < 23:
+				elseif locat['Stepdad'] = 10 and hour >= 18 and hour < 23:
 					gs 'arousal','foreplay', 1
 					'"Beautiful," Kolka whispers while gently cupping your breasts and stroking your pierced nipples.'
 					npc_rel['A34'] += 3
@@ -295,21 +287,12 @@ if $ARGS[0] = 'start':
 				end
 			elseif hour < 7 and brotherMorningSex = daystart:
 				'Your brother is busy getting ready for school.'
-			elseif hour < 23 and sdadloc ! 10:
+			elseif hour < 23 and locat['Stepdad'] ! 10:
 				'Your brother is playing video games.'
 			end
 
-			if hour >= 23 and brotherSex > 4 and brotherNightSex ! daystart and momloc ! 19:
+			if hour >= 23 and brotherSex > 4 and brotherNightSex ! daystart and locat['Mother'] ! 19:
 				'As you approach your sleeping brother, he suddenly opens his eyes and looks at you.'
-				!!sub/dom dialog needs fixing
-				!!if sub > 0 or (evgenQW >= 4 and fame['pav_slut'] >= 150):
-				!!	'"<<$pcs_nickname>>, help me sleep," he begs while throwing back the blanket, revealing his erection.'
-				!!	gs 'boyStat', 'A34'
-				!!	brotherSexCount -= 1
-				!!	brotherNightSex = daystart
-
-				!!	gs 'brother', 'brotherSexStart'
-				!!else
 				'He points to the mound under his blanket, "Sis, I can''t get any sleep, can you help?"'
 				cla
 				act 'Help him out':
@@ -326,20 +309,10 @@ if $ARGS[0] = 'start':
 					act 'Leave':gt 'sitrPar'
 					exit
 				end
-				!!end
 			end
 
-			if sdadloc ! 10 and hour >= 18 and hour < 23 and brotherSex > 4 and brotherEvSex ! daystart and momloc ! 19:
+			if locat['Stepdad'] ! 10 and hour >= 18 and hour < 23 and brotherSex > 4 and brotherEvSex ! daystart and locat['Mother'] ! 19:
 				'When you get close, Kolka turns to you.'
-				!!sub/dom dialog needs fixing
-				!!if sub > 0 or (evgenQW >= 4 and fame['pav_slut'] >= 150):
-					!!gs 'boyStat', 'A34'
-					!!'"Come on, <<$pcs_nickname>>, you have work to do!" Your brother drops his pants, exposing his hard <<npc_dick[''A34'']>> cm dick. "And be quiet, you don''t want to wake up <<$npc_nickname[''A29'']>> and dad."'
-					!!brotherSexCount -= 1
-					!!brotherEvSex = daystart
-
-					!!gs 'brother', 'brotherSexStart'
-				!!else
 				'"Sis, I''ve got a problem," he points to the lump in his pants. "Can you help me solve it?"'
 				cla
 				act 'Help him out':
@@ -357,13 +330,12 @@ if $ARGS[0] = 'start':
 					act 'Leave':gt 'sitrPar'
 					exit
 				end
-				!!end
 			end
 		end
 	end
 
 	if (week = 6 and brother_homework = daystart - 1) or (week = 7 and brother_homework = daystart - 2): brother_homework = daystart
-	if $loc = 'sitrPar' and brotherAge < 18 and kanikuli = 0 and npc_rel['A34'] >= 20 and brother_homework ! daystart and kolloc = 7:
+	if $loc = 'sitrPar' and brotherAge < 18 and kanikuli = 0 and npc_rel['A34'] >= 20 and brother_homework ! daystart and locat['Kolka'] = 7:
 		if rand(1,3) = 1:
 			cla
 			*clr & cla
@@ -878,7 +850,7 @@ if $ARGS[0] = 'brotherSexEnd':
 	gs 'stat'
 	!!sub/dom dialog needs fixing
 	!!if sub > 0 or (evgenQW >= 4 and fame['pav_slut'] >= 150):
-		!!if $loc = 'sitrPar' and sdadloc ! 10 and hour >= 18 and hour < 23:
+		!!if $loc = 'sitrPar' and locat['Stepdad'] ! 10 and hour >= 18 and hour < 23:
 			!!'Panting, Kolka looks at you and says, "That was great, <<$pcs_nickname>>!" He puts his softening cock back in his pants, "Just remember, this is our little secret!" He quickly turns his attention to something else.'
 			!!act 'Leave': gt 'sitrPar'
 		!!elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:
@@ -894,7 +866,7 @@ if $ARGS[0] = 'brotherSexEnd':
 			!!act 'Continue':gt $loc, $loc_arg
 		!!end
 	!!else
-	if $loc = 'sitrPar' and sdadloc ! 10 and kolloc = 11:
+	if $loc = 'sitrPar' and locat['Stepdad'] ! 10 and locat['Kolka'] = 11:
 		'With a wide grin on his face, Kolka tells you, "Many thanks, <<$pcs_nickname>>, you''ve helped me a lot." He resumes his prior business.'
 		act 'Leave': gt 'sitrPar'
 	elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:

locations/brother_lessons.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'homework':
 		gs 'stat'
 		'<center><b><font color = maroon>Kolka</font></b></center>'
 		'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/homework/homework_touch.mp4" width="1000" height="422"></center>'
-		if npc_QW['A34'] >= 3 and sdadloc ! 10:
+		if npc_QW['A34'] >= 3 and locat['Stepdad'] ! 10:
 			cla
 			pcs_horny += RAND(5,10)
 			'Partway through your sibling study session, you suddenly feel Kolka''s hand stroking your leg.'

locations/cikl.qsrc

@@ -1394,22 +1394,6 @@ if InSleep = 1: gs 'npc','cleanarrays'
 
 !!------------------------------------------------------------------------------------------------------------
 
-!!-------------Family schedule variables----------------------------------------------------------------------
-!! 23 = kitchen
-!! 24 = Living room
-!! 25 = bathroom
-!! 26 = Svetas room
-if week = 6:
-	momclean1 = rand(23,26)
-else
-	momclean1 = rand(23,24)
-end
-if rand(0,1) = 0:
-	momclean2 = 23
-else
-	momclean2 = 25
-end
-
 !!-------------Therapist Route schedule variables----------------------------------------------------------------------
 !! 23 = kitchen
 !! 24 = Living room

locations/dinfather.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] =  'watchtv_act1':
                     TouchedByFather = 1
                     '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim18.jpg"></center>'
                     'Biting your lip, you lie quietly on the chest of your stepfather and enjoy his caresses, restraining your moans. Slowly but surely he focuses more on your nipples, pinching them and tugging at them. You do your best to stay quiet, but it''s getting more and more difficult. Then you hear him let out a chuckle, and he whispers "<<$pcs_nickname>>, I know you''re not sleeping."'
-                    if npc_sex['A28']!0 and momloc['athome'] = 0:
+                    if npc_sex['A28']!0 and locat['Mom_athome'] = 0:
                         '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim21.jpg"></center>'
                         'You open your eyes and notice the large bulge in his pants. As you turn your head and give him a sweet smile, you put your hand on the bulge and gently start to pet it. Your stepfather, without hesitation, unbuttons his pants and pulls out his dick. You, also without hesitation, lower your head and give it a lick.'
                         act 'Get down on your knees':gs 'fathersex',  'fatherblow4'
@@ -315,7 +315,7 @@ if $ARGS[0] =  'watchtv_act1':
                     pcs_ass+=1
                     if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim17.jpg"></center>' & 'Not noticing any reluctance from you, your stepfather continues his kneading and then slides his hands underneath your clothes. His sexual preference is abundantly clear: he immediately searches out your tight asshole, and gently rubs his finger against it. Unable to help yourself you begin to gyrate your hips to mimic his movements, trying to stifle your moans. He notices anyway: the pressure of his finger against your sphincter grows, and his decisive actions make you realize he has no intentions of stopping there. When his finger penetrates you, you can''t hold back your moans any longer. He chuckles and whispers: "I knew you were awake all along <<$pcs_nickname>>, just relax and enjoy."'
                     if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim16.jpg"></center>' & 'When his hand slips under your clothes, you feel his fingers feeling around for a second, grasping for something that isn''t there. He was clearly expecting panties, and is confused by the lack of them. When he realizes you''re not wearing any his actions grow bolder, and soon feel two fingers rubbing up against your asshole with the intention of going in. You adjust your hips slightly to grant him easier access, which he recognizes as a sign of consent and increases the pressure on your sphincter, pushing his two fingers in slowly but surely.'
-                    if npc_sex['A28']!0 and momloc['athome'] = 0:
+                    if npc_sex['A28']!0 and locat['Mom_athome'] = 0:
                         '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim21.jpg"></center>'
                         'You open your eyes and notice the large bulge in his pants. As you turn your head and give him a sweet smile, you put your hand on the bulge and gently start to pet it. Your stepfather, without hesitation, unbuttons his pants and pulls out his dick. You, also without hesitation, lower your head and give it a lick.'
                         act 'Get down on your knees': gs 'fathersex',  'fatherblow4'
@@ -429,7 +429,7 @@ end
 if $ARGS[0] =  'watchtv4':
     !good relations and Messrs attractive
     talkrand=rand(1,100)
-    if talkrand>=80 and kolloc['athome'] = 1:
+    if talkrand>=80 and locat['Kolka_athome'] = 1:
         gs 'dinfather', 'watchtv3'
     else
         'You relax and talk about the show you''re watching with your stepfather, cuddling up snugly against him.'

locations/djibril.qsrc

@@ -338,7 +338,7 @@ if $ARGS[0] = 'textanya':
 	'<center><img <<$set_imgh>> src="images/pc/activities/phone/text_indoor.jpg"></center>'
 	'While the two of you are sitting on the couch, you pull out your phone and send Anya a text. "Hey, what are you doing?"'
 	gs 'family_schedule'
-	if anyaloc < 9 or anyaloc > 15: DjibrilQW['anya_busy'] = daystart
+	if locat['Anya'] < 9 or locat['Anya'] > 15: DjibrilQW['anya_busy'] = daystart
 	if DjibrilQW['anya_busy'] = daystart:
 		'You wait a few seconds before you get a reply. "I''m busy. Why?"'
 		'You sigh and reply "Nothing. I''ll talk to you later."'

locations/family.qsrc

@@ -57,47 +57,47 @@ if mid($start_type,1,2) = 'sg':
 		end
 	end
 
-	if sister_indorf = 0 and $loc = 'pav_commcenter' and anyaloc = 10:
+	if sister_indorf = 0 and $loc = 'pav_commcenter' and locat['Anya'] = 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:
 		if $loc = 'bedrPar2':
-			if momloc = 1 and sdadloc = 1:
+			if locat['Mother'] = 1 and locat['Stepdad'] = 1:
 				'Your <<$npc_nickname[''A29'']>> and stepfather are sleeping on the bed.'
-			elseif momloc = 1:
+			elseif locat['Mother'] = 1:
 				'Your <<$npc_nickname[''A29'']>> is sleeping on the bed.'
-			elseif sdadloc = 1:
+			elseif locat['Stepdad'] = 1:
 				'Your stepfather is sleeping on the bed.'
 			end
 		end
 
 		if $loc = 'sitrPar' or ($loc = 'family' and $loc_arg = 'sofa'):
-			if kolloc = 2 and brothermorningsex = daystart:
+			if locat['Kolka'] = 2 and brothermorningsex = daystart:
 				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is getting ready for school.'
-			elseif kolloc = 1:
+			elseif locat['Kolka'] = 1:
 				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
-			elseif kolloc = 7:
+			elseif locat['Kolka'] = 7:
 				ocpd_room = 1
 				'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
-			elseif kolloc = 11:
+			elseif locat['Kolka'] = 11:
 				ocpd_room = 1
-				if momloc = 19 and sdadloc = 10:
+				if locat['Mother'] = 19 and locat['Stepdad'] = 10:
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
-				elseif momloc = 19:
+				elseif locat['Mother'] = 19:
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
-				elseif sdadloc = 10:
+				elseif locat['Stepdad'] = 10:
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
 				else
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
 				end
 			end
 
-			if sdadloc = 10:
+			if locat['Stepdad'] = 10:
 				ocpd_room = 1
-				if momloc = 19:
+				if locat['Mother'] = 19:
 					''
 				else
 					'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
@@ -106,9 +106,9 @@ if mid($start_type,1,2) = 'sg':
 		end
 
 		if $loc = 'gschool_grounds':
-			if week = 5 and kolloc = 6:
+			if week = 5 and locat['Kolka'] = 6:
 				'You wonder if your <a href="exec:gt ''brother'', ''start''">brother</a> is one of the kids yelling.'
-			elseif (week < 6 and kolloc = 6) or ((week >= 6 or kanikuli > 0) and kolloc = 9):
+			elseif (week < 6 and locat['Kolka'] = 6) or ((week >= 6 or kanikuli > 0) and locat['Kolka'] = 9):
 				'You see your <a href="exec:gt ''brother'', ''start''">brother</a> play football by the field near the school.'
 			end
 		end
@@ -117,7 +117,7 @@ end
 
 if $loc = 'sitrPar': act 'Sit on the sofa':gt 'family', 'sofa'
 
-if $loc = 'sitrPar' and ocpd_room = 0 and momloc ! 24 and momloc ! 19:
+if $loc = 'sitrPar' and ocpd_room = 0 and locat['Mother'] ! 24 and locat['Mother'] ! 19:
 	'No one else is here right now, so you''re free to use the room how you like.'
 	gs 'exercise','start'
 end

locations/family_schedule.qsrc

@@ -1,226 +1,231 @@
 # family_schedule
+!! 2022/06/04 - Alaratt
 
-!!Each action will use '<name>loc' ie. momloc
+locat['Anya'] = 0
+locat['Anya_athome'] = 0
+locat['Anya_inroom'] = 0
+locat['Mother'] = 0
+locat['Mom_athome'] = 0
+locat['Stepdad'] = 0
+locat['sdad_athome'] = 0
+locat['Kolka'] = 0
+locat['Kolka_athome'] = 0
 
-momloc = 0
-sdadloc = 0
-anyaloc = 0
-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)
-!! anyaloc['inroom'] = 1 means Anya is actually in the room, so masturbating while she is in the shower is possible
+!! locat['Anya_athome'] = 1 means Anya is at home, awake, and not in an event (like having sex with Roma)
+!! locat['Anya_inroom'] = 1 means Anya is actually in the room, so masturbating while she is in the shower is possible
 !! unused - 6, 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
-			anyaloc['athome'] = 0
-			anyaloc['inroom'] = 1
+			locat['Anya'] = 1
+			locat['Anya_athome'] = 0
+			locat['Anya_inroom'] = 1
 		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!!Family breakfast
-			anyaloc = 2
-			anyaloc['athome'] = 1
-			anyaloc['inroom'] = 0
+			locat['Anya'] = 2
+			locat['Anya_athome'] = 1
+			locat['Anya_inroom'] = 0
 		elseif hour = 7 and minut < 30:
 			!!Helping mom clean up
-			anyaloc = 3
-			anyaloc['athome'] = 1
-			anyaloc['inroom'] = 0
+			locat['Anya'] = 3
+			locat['Anya_athome'] = 1
+			locat['Anya_inroom'] = 0
 		elseif hour < 8:
 			!!In Bedroom getting ready
-			anyaloc = 4
-			anyaloc['athome'] = 1
-			anyaloc['inroom'] = 1
+			locat['Anya'] = 4
+			locat['Anya_athome'] = 1
+			locat['Anya_inroom'] = 1
 		elseif hour = 8 and minut < 20:
 			!!Shower*
-			anyaloc = 5
-			anyaloc['athome'] = 1
-			anyaloc['inroom'] = 0
+			locat['Anya'] = 5
+			locat['Anya_athome'] = 1
+			locat['Anya_inroom'] = 0
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':anyaQW['bathroom_dildos'] = vanrPar_suction_dildo
 		elseif hour = 8 and minut < 30:
 			!!traveling to work
-			anyaloc = 8
-			anyaloc['athome'] = 0
-			anyaloc['inroom'] = 0
+			locat['Anya'] = 8
+			locat['Anya_athome'] = 0
+			locat['Anya_inroom'] = 0
 		elseif hour < 15 or (hour = 15 and minut < 50):
 			!!Work
-			anyaloc = 7
-			anyaloc['athome'] = 0
-			anyaloc['inroom'] = 0
+			locat['Anya'] = 7
+			locat['Anya_athome'] = 0
+			locat['Anya_inroom'] = 0
 		elseif hour < 16:
 			!!traveling from work
-			anyaloc = 9
-			anyaloc['athome'] = 0
-			anyaloc['inroom'] = 0
+			locat['Anya'] = 9
+			locat['Anya_athome'] = 0
+			locat['Anya_inroom'] = 0
 		elseif hour < 18:
 			if week = 5:
 				!!At the community center
-				anyaloc = 10
-				anyaloc['athome'] = 0
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 10
+				locat['Anya_athome'] = 0
+				locat['Anya_inroom'] = 0
 			elseif sisboyday + 1 = daystart:
 				!!in bedroom with Roma
-				anyaloc = 11
-				anyaloc['athome'] = 1
-				anyaloc['inroom'] = 1
+				locat['Anya'] = 11
+				locat['Anya_athome'] = 1
+				locat['Anya_inroom'] = 1
 			else
 				!!Personal activities: Relaxing in bedroom 15, at the community center 10
-				if anyaloc['rand1'] ! daystart:
-					anyaloc = func('shortgs', 'rand_pick', '', 10, 15)
-					anyaloc['rand1'] = daystart
-					anyaloc['save1'] = anyaloc
+				if locat['Anya_rand1'] ! daystart:
+					locat['Anya'] = func('shortgs', 'rand_pick', '', 10, 15)
+					locat['Anya_rand1'] = daystart
+					locat['Anya_save1'] = locat['Anya']
 				else
-					anyaloc = anyaloc['save1']
+					locat['Anya'] = locat['Anya']['save1']
 				end
-				if anyaloc = 15:
-					anyaloc['athome'] = 1
-					anyaloc['inroom'] = 1
+				if locat['Anya'] = 15:
+					locat['Anya_athome'] = 1
+					locat['Anya_inroom'] = 1
 				else
-					anyaloc['athome'] = 0
-					anyaloc['inroom'] = 0
+					locat['Anya_athome'] = 0
+					locat['Anya_inroom'] = 0
 				end
 			end
 		elseif hour = 18 and minut <= 30:
 			if week = 5:
 				!!Goes to a party
-				anyaloc = 24
-				anyaloc['athome'] = 0
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 24
+				locat['Anya_athome'] = 0
+				locat['Anya_inroom'] = 0
 			else
 				!!Family dinner
-				anyaloc = 12
-				anyaloc['athome'] = 1
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 12
+				locat['Anya_athome'] = 1
+				locat['Anya_inroom'] = 0
 			end
 		elseif hour < 22:
 			if week = 5:
 				!!Goes to a party
-				anyaloc = 24
-				anyaloc['athome'] = 0
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 24
+				locat['Anya_athome'] = 0
+				locat['Anya_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)
-				if anyaloc['rand2'] ! daystart:
-					anyaloc = func('shortgs', 'rand_pick', '', 13, 14, 15)
-					anyaloc['rand2'] = daystart
-					anyaloc['save2'] = anyaloc
+				if locat['Anya_rand2'] ! daystart:
+					locat['Anya'] = func('shortgs', 'rand_pick', '', 13, 14, 15)
+					locat['Anya_rand2'] = daystart
+					locat['Anya_save2'] = locat['Anya']
 				else
-					anyaloc = anyaloc['save2']
+					locat['Anya'] = locat['Anya']['save2']
 				end
-				if anyaloc = 15:
-					anyaloc['athome'] = 1
-					anyaloc['inroom'] = 1
+				if locat['Anya'] = 15:
+					locat['Anya_athome'] = 1
+					locat['Anya_inroom'] = 1
 				else
-					anyaloc['athome'] = 0
-					anyaloc['inroom'] = 0
+					locat['Anya_athome'] = 0
+					locat['Anya_inroom'] = 0
 				end
 			end
 		else
 			if week = 5:
 				!!Goes to a party
-				anyaloc = 24
-				anyaloc['athome'] = 0
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 24
+				locat['Anya_athome'] = 0
+				locat['Anya_inroom'] = 0
 			else
 				!!In her room
-				anyaloc = 15
-				anyaloc['athome'] = 1
-				anyaloc['inroom'] = 1
+				locat['Anya'] = 15
+				locat['Anya_athome'] = 1
+				locat['Anya_inroom'] = 1
 			end
 		end
 	else
 		if hour < 2:
 			!!Goes to a party
-			anyaloc = 24
-			anyaloc['athome'] = 0
-			anyaloc['inroom'] = 0
+			locat['Anya'] = 24
+			locat['Anya_athome'] = 0
+			locat['Anya_inroom'] = 0
 		elseif hour = 2 and minut < 20:
 			!!In her room drunk after party
-			anyaloc = 26
-			anyaloc['athome'] = 0
-			anyaloc['inroom'] = 1
+			locat['Anya'] = 26
+			locat['Anya_athome'] = 0
+			locat['Anya_inroom'] = 1
 		elseif hour < 9:
 			!!Asleep
-			anyaloc = 1
-			anyaloc['athome'] = 0
-			anyaloc['inroom'] = 1
+			locat['Anya'] = 1
+			locat['Anya_athome'] = 0
+			locat['Anya_inroom'] = 1
 		elseif hour = 9 and minut <= 20:
 			!!Eat something in kitchen
-			anyaloc = 16
-			anyaloc['athome'] = 1
-			anyaloc['inroom'] = 0
+			locat['Anya'] = 16
+			locat['Anya_athome'] = 1
+			locat['Anya_inroom'] = 0
 		elseif hour = 9 and minut < 40:
 			!!Shower*
-			anyaloc = 5
-			anyaloc['athome'] = 1
-			anyaloc['inroom'] = 0
+			locat['Anya'] = 5
+			locat['Anya_athome'] = 1
+			locat['Anya_inroom'] = 0
 		elseif hour < 10:
 			!!In Bedroom
-			anyaloc = 4
-			anyaloc['athome'] = 1
-			anyaloc['inroom'] = 1
+			locat['Anya'] = 4
+			locat['Anya_athome'] = 1
+			locat['Anya_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
+				locat['Anya'] = 17
+				locat['Anya_athome'] = 0
+				locat['Anya_inroom'] = 0
 			else
 				!!Stays at home
-				anyaloc = 15
-				anyaloc['athome'] = 1
-				anyaloc['inroom'] = 1
+				locat['Anya'] = 15
+				locat['Anya_athome'] = 1
+				locat['Anya_inroom'] = 1
 			end
 		elseif hour < 18:
 			if week = 6:
 				!!At the community center
-				anyaloc = 10
-				anyaloc['athome'] = 0
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 10
+				locat['Anya_athome'] = 0
+				locat['Anya_inroom'] = 0
 			else
 				!!Works out at the community center
-				anyaloc = 21
-				anyaloc['athome'] = 0
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 21
+				locat['Anya_athome'] = 0
+				locat['Anya_inroom'] = 0
 			end
 		elseif hour = 18 and minut <= 30:
 			if week = 6:
 				!!Goes to a party
-				anyaloc = 24
-				anyaloc['athome'] = 0
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 24
+				locat['Anya_athome'] = 0
+				locat['Anya_inroom'] = 0
 			else
 				!!Family dinner
-				anyaloc = 12
-				anyaloc['athome'] = 1
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 12
+				locat['Anya_athome'] = 1
+				locat['Anya_inroom'] = 0
 			end
 		elseif hour < 19:
 			if week = 7:
 				!!helps mom clean up after dinner
-				anyaloc = 23
-				anyaloc['athome'] = 1
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 23
+				locat['Anya_athome'] = 1
+				locat['Anya_inroom'] = 0
 			else
 				!!Goes to a party
-				anyaloc = 24
-				anyaloc['athome'] = 0
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 24
+				locat['Anya_athome'] = 0
+				locat['Anya_inroom'] = 0
 			end
 		else
 			if week = 7:
 				!!in her room
-				anyaloc = 15
-				anyaloc['athome'] = 1
-				anyaloc['inroom'] = 1
+				locat['Anya'] = 15
+				locat['Anya_athome'] = 1
+				locat['Anya_inroom'] = 1
 			else
 				!!Goes to a party
-				anyaloc = 24
-				anyaloc['athome'] = 0
-				anyaloc['inroom'] = 0
+				locat['Anya'] = 24
+				locat['Anya_athome'] = 0
+				locat['Anya_inroom'] = 0
 			end
 		end
 	end
@@ -228,197 +233,235 @@ end
 
 !!---MOM--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-!!momloc [11] = daystart check in salon
+!!locat['Mom_Salon_daystart'] = daystart check in salon
 !!indorf = 1 means mom is in the village
-!!momloc['athome'] = 1 means mom is at home and awake
+!!locat['Mom_athome'] = 1 means mom is at home and awake
+!!unused number - 22, 27+
 if indorf = 0:
 	if week <= 5:
 		if hour < 5 or (hour = 5 and minut < 30):
 			!!Asleep
-			momloc = 1
-			momloc['athome'] = 0
+			locat['Mother'] = 1
+			locat['Mom_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'
+			locat['Mother'] = 2
+			locat['Mom_athome'] = 1
+			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar': gs'mother_sextalk','discover_dildo'
 		elseif hour < 6:
 			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka
-			momloc = 3
-			momloc['athome'] = 1
+			locat['Mother'] = 3
+			locat['Mom_athome'] = 1
 		elseif hour = 6 or (hour = 7 and minut < 30):
-			momloc = 4
-			momloc['athome'] = 1
+			locat['Mother'] = 4
+			locat['Mom_athome'] = 1
 			if hour = 6 and minut <= 40:
 				!! Make Breakfast
-				momloc['kitchen_action'] = 1
+				locat['Mom_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
+				locat['Mom_kitchen_action'] = 2
 			elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 				!! Family breakfast
-				momloc['kitchen_action'] = 3
+				locat['Mom_kitchen_action'] = 3
 			else
 				!! Clean up breakfast table
-				momloc['kitchen_action'] = 4
+				locat['Mom_kitchen_action'] = 4
 			end
 		elseif hour = 7 or (hour = 8 and minut < 30):
 			!!Cleaning random room in the house
-			!!variable set in cikl
-			momloc = momclean1
-			momloc['athome'] = 1
+			!! 23 = Kitchen
+			!! 24 = Living room
+			if locat['Mother_clean1_daystart'] ! daystart:
+				locat['Mother_clean1_daystart'] = daystart
+				if rand(0, 1) = 1:
+					locat['Mother_clean1'] = 23
+				else
+					locat['Mother_clean1'] = 24
+				end
+			end
+			locat['Mother'] = locat['Mother_clean1']
+			locat['Mom_athome'] = 1
 		elseif (week < 5 and hour < 16) or (week = 5 and (hour < 17 or (hour = 17 and minut <= 50))):
 			!!Working in the cafe. On Friday she stays until 17:50
-			momloc = 9
-			momloc['athome'] = 0
+			locat['Mother'] = 9
+			locat['Mom_athome'] = 0
 		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
+			locat['Mother'] = 7
+			locat['Mom_athome'] = 0
 		elseif hour < 17 and week < 5:
 			!!Walking home
-			momloc = 8
-			momloc['athome'] = 0
+			locat['Mother'] = 8
+			locat['Mom_athome'] = 0
 		elseif hour < 18 and week = 5:
 			!!Walking home
-			momloc = 10
-			momloc['athome'] = 0
+			locat['Mother'] = 10
+			locat['Mom_athome'] = 0
 		elseif hour < 18:
 			!!Making dinner (On Friday she brings home leftovers from the cafe)
-			momloc = 11
-			momloc['athome'] = 1
+			locat['Mother'] = 11
+			locat['Mom_athome'] = 1
 		elseif hour = 18 and minut <= 30:
 			!!Family dinner
-			momloc = 12
-			momloc['athome'] = 1
+			locat['Mother'] = 12
+			locat['Mom_athome'] = 1
 		elseif hour < 19:
 			!! Cleaning dinner table/Doing dishes
-			momloc = 13
-			momloc['athome'] = 1
+			locat['Mother'] = 13
+			locat['Mom_athome'] = 1
 		elseif hour < 20:
 			if week = 1:
 				!! Visiting Luda on mondays for 3 hours
-				momloc = 20
-				momloc['athome'] = 0
+				locat['Mother'] = 20
+				locat['Mom_athome'] = 0
 			else
-				!! (cleaning the bathroom, sweeping, mopping, dusting, watching TV, taking a bath, etc in different rooms)
-				momloc = momclean2
-				momloc['athome'] = 1
-				if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':gs'mother_sextalk','discover_dildo'
+				!!Cleaning random room in the house
+				!! 23 = Kitchen
+				!! 25 = Bathroom
+				if locat['Mother_clean2_daystart'] ! daystart:
+					locat['Mother_clean2_daystart'] = daystart
+					if rand(0,1) = 0:
+						locat['Mother_clean2'] = 23
+					else
+						locat['Mother_clean2'] = 25
+					end
+				end
+				locat['Mother'] = locat['Mother_clean2']
+				locat['Mom_athome'] = 1
+				if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar' and locat['Mother'] = 25: gs'mother_sextalk','discover_dildo'
 			end
 		elseif hour < 22:
 			if week = 1:
 				!! Visiting Luda on mondays for 3 hours
-				momloc = 20
-				momloc['athome'] = 0
+				locat['Mother'] = 20
+				locat['Mom_athome'] = 0
 			elseif week < 5:
 				!! Watches TV with Vladimir
-				momloc = 19
-				momloc['athome'] = 1
+				locat['Mother'] = 19
+				locat['Mom_athome'] = 1
 			else
 				!! Watches TV alone
-				momloc = 19
-				momloc['athome'] = 1
+				locat['Mother'] = 19
+				locat['Mom_athome'] = 1
 			end
 		else
 			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
-			momloc = 1
-			momloc['athome'] = 0
+			locat['Mother'] = 1
+			locat['Mom_athome'] = 0
 		end
 	else
 		if hour < 5 or (hour = 5 and minut < 30):
 			!! Asleep
-			momloc = 1
+			locat['Mother'] = 1
 		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'
+			locat['Mother'] = 2
+			locat['Mom_athome'] = 1
+			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar': gs'mother_sextalk','discover_dildo'
 		elseif hour < 6:
 			!! Getting dressed in her room, if Sveta knocks she''ll ask you to wake Kolka 
-			momloc = 3
-			momloc['athome'] = 1
+			locat['Mother'] = 3
+			locat['Mom_athome'] = 1
 		elseif hour = 6 or (hour = 7 and minut < 30):
-			momloc = 4
-			momloc['athome'] = 1
+			locat['Mother'] = 4
+			locat['Mom_athome'] = 1
 			if hour = 6 and minut <= 40:
 				!! Make Breakfast
-				momloc['kitchen_action'] = 1
+				locat['Mom_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
+				locat['Mom_kitchen_action'] = 2
 			elseif hour = 6 or (hour = 7 and minut <= 15):
 				!! Family breakfast
-				momloc['kitchen_action'] = 3
+				locat['Mom_kitchen_action'] = 3
 			else
-				momloc['kitchen_action'] = 4
+				locat['Mom_kitchen_action'] = 4
 				!! Clean up breakfast table
 			end
 		elseif hour < 11:
 			!!Cleaning random room in the house
-			momloc = momclean1
-			momloc['athome'] = 1
+			!! 23 = Kitchen
+			!! 24 = Living room
+			!! 25 = Bathroom
+			!! 26 = Svetas room
+			if locat['Mother_clean1_daystart'] ! daystart:
+				locat['Mother_clean1_daystart'] = daystart
+				if week = 6:
+					locat['Mother_clean1'] = rand(23,26)
+				else
+					locat['Mother_clean1'] = rand(23,24)
+				end
+			end
+			locat['Mother'] = locat['Mother_clean1']
+			locat['Mom_athome'] = 1
+			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar' and locat['Mother'] = 25: gs'mother_sextalk','discover_dildo'
 		elseif hour = 11 and minut < 30:
 			!!Traveling - takes the car to town/walks to church
-			momloc = 14
-			momloc['athome'] = 0
+			locat['Mother'] = 14
+			locat['Mom_athome'] = 0
 		elseif hour < 12 or (hour = 12 and minut < 30):
 			!! Gets her nails done/hair cut at the salon or such things - On Sunday goes to the church during these hours
-			momloc['athome'] = 0
+			locat['Mom_athome'] = 0
 			if week = 6:
-				!! Salon
-				momloc = 15
+				if locat['Mom_Salon_daystart'] = daystart:
+					!! Walks around different shops, looking at and buying stuff
+					locat['Mother'] = 15
+				else
+					!! Salon
+					locat['Mother'] = 21
+				end
 			else
 				!!Church
-				momloc = 16
+				locat['Mother'] = 16
 			end
 		elseif hour = 12 or (hour = 13 and minut < 30) and week = 6:
 			!!Church
-			momloc = 16
+			locat['Mother'] = 16
 		elseif hour < 14:
 			!! Walks around different shops, looking at and buying stuff - On Sunday goes to church during these hours
-			momloc = 15
-			momloc['athome'] = 0
+			locat['Mother'] = 15
+			locat['Mom_athome'] = 0
 		elseif hour < 17:
 			!!Helping out Sergey/Luda, going to Kolka''s games?
-			momloc = rand(14,15)
-			momloc['athome'] = 0
+			locat['Mother'] = rand(14,15)
+			locat['Mom_athome'] = 0
 		elseif hour < 18:
 			!! Making dinner
-			momloc = 11
-			momloc['athome'] = 1
+			locat['Mother'] = 11
+			locat['Mom_athome'] = 1
 		elseif hour = 18 and minut <= 30:
 			!!Family dinner
-			momloc = 12
-			momloc['athome'] = 1
+			locat['Mother'] = 12
+			locat['Mom_athome'] = 1
 		elseif hour < 19:
 			!! Cleaning dinner table/Doing dishes
-			momloc = 13
-			momloc['athome'] = 1
+			locat['Mother'] = 13
+			locat['Mom_athome'] = 1
 		elseif hour < 21:
 			!!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
+			locat['Mom_athome'] = 0
 			if week = 6:
 				!!Slutting around?
-				momloc = 17
+				locat['Mother'] = 17
 			else
 				!!Church - Mass
-				momloc = 18
+				locat['Mother'] = 18
 			end
 		elseif hour < 22:
 			if week = 7:
 				!! Watches TV with Vladimir
-				momloc = 19
-				momloc['athome'] = 1
+				locat['Mother'] = 19
+				locat['Mom_athome'] = 1
 			else
 				!! Watches TV alone
-				momloc = 19
-				momloc['athome'] = 1
+				locat['Mother'] = 19
+				locat['Mom_athome'] = 1
 			end
 		else
 			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
-			momloc = 1
-			momloc['athome'] = 0
+			locat['Mother'] = 1
+			locat['Mom_athome'] = 0
 		end
 	end
 end
@@ -429,129 +472,129 @@ if indorf = 0:
 	if week <= 5:
 		if hour < 6 or (hour = 6 and minut < 10):
 			!! Asleep
-			sdadloc = 1
-			sdadloc['athome'] = 0
+			locat['Stepdad'] = 1
+			locat['sdad_athome'] = 0
 		elseif hour = 6 and minut < 45:
 			!!Getting ready
-			sdadloc = 2
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 2
+			locat['sdad_athome'] = 1
 		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!!family breakfast
-			sdadloc = 3
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 3
+			locat['sdad_athome'] = 1
 		elseif hour < 8:
 			!!Reads paper in kitchen
-			sdadloc = 4
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 4
+			locat['sdad_athome'] = 1
 		elseif hour = 8 and minut < 30:
 			!!Watching TV
-			sdadloc = 10
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 10
+			locat['sdad_athome'] = 1
 		elseif hour = 8 and minut < 45:
 			!! shave/get dressed
-			sdadloc = 5
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 5
+			locat['sdad_athome'] = 1
 		elseif hour < 17 or (hour = 17 and minut < 45):
 			!! Work (includes lunch time)
-			sdadloc = 6
-			sdadloc['athome'] = 0
+			locat['Stepdad'] = 6
+			locat['sdad_athome'] = 0
 		elseif hour < 18:
 			!! Sets the table for dinner
-			sdadloc = 7
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 7
+			locat['sdad_athome'] = 1
 		elseif hour = 18 and minut <= 30:
 			!! Family dinner
-			sdadloc = 8
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 8
+			locat['sdad_athome'] = 1
 		elseif hour < 19 or (hour = 19 and minut < 45):
 			if week = 5:
 				!!In the garage drinking with Misha
 				fatherdrunk = 1
-				sdadloc = 9
-				sdadloc['athome'] = 1
+				locat['Stepdad'] = 9
+				locat['sdad_athome'] = 1
 			else
 				!! In garage
-				sdadloc = 9
-				sdadloc['athome'] = 1
+				locat['Stepdad'] = 9
+				locat['sdad_athome'] = 1
 			end
 		elseif hour < 21 or (hour = 21 and minut < 45):
 			if week = 5:
 				!!In the garage drinking with Misha
 				fatherdrunk = 1
-				sdadloc = 9
-				sdadloc['athome'] = 1
+				locat['Stepdad'] = 9
+				locat['sdad_athome'] = 1
 			else
 				!! Watch tv in living room
-				sdadloc = 10
-				sdadloc['athome'] = 1
+				locat['Stepdad'] = 10
+				locat['sdad_athome'] = 1
 			end
 		elseif hour < 22:
 			!! Take shower
-			sdadloc = 11
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 11
+			locat['sdad_athome'] = 1
 		else
 			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
-			sdadloc = 1
-			sdadloc['athome'] = 0
+			locat['Stepdad'] = 1
+			locat['sdad_athome'] = 0
 		end
 	else
 		if hour < 6 or (hour = 6 and minut < 10):
 			!! Asleep
-			sdadloc = 1
-			sdadloc['athome'] = 0
+			locat['Stepdad'] = 1
+			locat['sdad_athome'] = 0
 		elseif hour < hour = 6 and minut < 45:
 			!!Getting ready
-			sdadloc = 2
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 2
+			locat['sdad_athome'] = 1
 		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!!family breakfast
-			sdadloc = 3
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 3
+			locat['sdad_athome'] = 1
 		elseif hour < 8:
 			!!Reads paper in kitchen
-			sdadloc = 4
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 4
+			locat['sdad_athome'] = 1
 		elseif hour = 8 and minut < 20:
 			!! Take shower
-			sdadloc = 11
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 11
+			locat['sdad_athome'] = 1
 		elseif hour < 9:
 			!! Watch tv in living room
-			sdadloc = 10
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 10
+			locat['sdad_athome'] = 1
 		elseif hour < 13:
 			if week = 6:
 				!!In the garage
-				sdadloc = 9
-				sdadloc['athome'] = 1
+				locat['Stepdad'] = 9
+				locat['sdad_athome'] = 1
 			else
 				!! Unknown - maybe just left apartment
-				sdadloc = 12
-				sdadloc['athome'] = 0
+				locat['Stepdad'] = 12
+				locat['sdad_athome'] = 0
 			end
 		elseif hour < 18:
 			!!In the garage
-			sdadloc = 9
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 9
+			locat['sdad_athome'] = 1
 		elseif hour = 18 and minut <= 30:
 			!! Family dinner
-			sdadloc = 8
-			sdadloc['athome'] = 1
+			locat['Stepdad'] = 8
+			locat['sdad_athome'] = 1
 		elseif hour < 22:
 			if week = 6:
 				!!In the garage drinking with Misha
 				fatherdrunk = 1
-				sdadloc = 9
-				sdadloc['athome'] = 1
+				locat['Stepdad'] = 9
+				locat['sdad_athome'] = 1
 			else
 				!! Watch tv in living room
-				sdadloc = 10
-				sdadloc['athome'] = 1
+				locat['Stepdad'] = 10
+				locat['sdad_athome'] = 1
 			end
 		else
 			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
-			sdadloc = 1
-			sdadloc['athome'] = 0
+			locat['Stepdad'] = 1
+			locat['sdad_athome'] = 0
 		end
 	end
 end
@@ -563,119 +606,119 @@ if indorf = 0:
 		if hour < 6 or (hour = 6 and minut < 45):
 			if brothermorningsex ! daystart:
 				!! Sleep
-				kolloc = 1
-				kolloc['athome'] = 0
+				locat['Kolka'] = 1
+				locat['Kolka_athome'] = 0
 			else
 				!! Awake - Sveta woke him up
-				kolloc = 2
-				kolloc['athome'] = 1
+				locat['Kolka'] = 2
+				locat['Kolka_athome'] = 1
 			end
 		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!! Family Breakfast
-			kolloc = 3
-			kolloc['athome'] = 1
+			locat['Kolka'] = 3
+			locat['Kolka_athome'] = 1
 		elseif hour < 8:
 			!! Leaves for school and hangs out with friends
-			kolloc = 4
-			kolloc['athome'] = 0
+			locat['Kolka'] = 4
+			locat['Kolka_athome'] = 0
 		elseif hour < 14:
 			if kanikuli = 0:
 				!! At School
-				kolloc = 5
-				kolloc['athome'] = 0
+				locat['Kolka'] = 5
+				locat['Kolka_athome'] = 0
 			else
 				!! Track Field since no school on holidays
-				kolloc = 6
-				kolloc['athome'] = 0
+				locat['Kolka'] = 6
+				locat['Kolka_athome'] = 0
 			end
 		elseif hour >= 14 and hour < 17:
 			!! Track Field
-			kolloc = 6
-			kolloc['athome'] = 0
+			locat['Kolka'] = 6
+			locat['Kolka_athome'] = 0
 		elseif hour < 18:
 			if kanikuli = 0 and brother_homework ! daystart:
 				!! Homework
-				kolloc = 7
-				kolloc['athome'] = 1
+				locat['Kolka'] = 7
+				locat['Kolka_athome'] = 1
 			else
 				!! Watches TV or games
-				kolloc = 11
-				kolloc['athome'] = 1
+				locat['Kolka'] = 11
+				locat['Kolka_athome'] = 1
 			end
 		elseif hour = 18 and minut <= 30:
 			!! Family Dinner
-			kolloc = 8
-			kolloc['athome'] = 1
+			locat['Kolka'] = 8
+			locat['Kolka_athome'] = 1
 		elseif hour < 21:
 			!! Leaves apartment
-			kolloc = 9
-			kolloc['athome'] = 0
+			locat['Kolka'] = 9
+			locat['Kolka_athome'] = 0
 		elseif hour = 21 and minut < 15:
 			!! Shower
-			kolloc = 10
-			kolloc['athome'] = 1
+			locat['Kolka'] = 10
+			locat['Kolka_athome'] = 1
 		elseif hour < 23:
 			!! Watches TV or games
-			kolloc = 11
-			kolloc['athome'] = 1
+			locat['Kolka'] = 11
+			locat['Kolka_athome'] = 1
 		else
 			!! Sleep
-			kolloc = 1
-			kolloc['athome'] = 0
+			locat['Kolka'] = 1
+			locat['Kolka_athome'] = 0
 		end
 	else
 		if hour < 6 or (hour = 6 and minut < 45):
 			if brothermorningsex ! daystart:
 				!! Sleep
-				kolloc = 1
-				kolloc['athome'] = 0
+				locat['Kolka'] = 1
+				locat['Kolka_athome'] = 0
 			else
 				!! Awake - Sveta woke him up
-				kolloc = 2
-				kolloc['athome'] = 1
+				locat['Kolka'] = 2
+				locat['Kolka_athome'] = 1
 			end
 		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!! Family Breakfast
-			kolloc = 3
-			kolloc['athome'] = 1
+			locat['Kolka'] = 3
+			locat['Kolka_athome'] = 1
 		elseif hour < 10:
 			if kanikuli = 0 and brother_homework ! daystart:
 				!! Homework
-				kolloc = 7
-				kolloc['athome'] = 1
+				locat['Kolka'] = 7
+				locat['Kolka_athome'] = 1
 			else
 				!! Watches TV or games
-				kolloc = 11
-				kolloc['athome'] = 1
+				locat['Kolka'] = 11
+				locat['Kolka_athome'] = 1
 			end
 		elseif hour <= 13:
 			!! Watches TV
-			kolloc = 11
-			kolloc['athome'] = 1
+			locat['Kolka'] = 11
+			locat['Kolka_athome'] = 1
 		elseif hour < 18:
 			!! Leaves apartment
-			kolloc = 9
-			kolloc['athome'] = 0
+			locat['Kolka'] = 9
+			locat['Kolka_athome'] = 0
 		elseif hour = 18 and minut <= 30:
 			!! Family Dinner
-			kolloc = 8
-			kolloc['athome'] = 1
+			locat['Kolka'] = 8
+			locat['Kolka_athome'] = 1
 		elseif hour < 21:
 			!! Watches TV or games
-			kolloc = 11
-			kolloc['athome'] = 1
+			locat['Kolka'] = 11
+			locat['Kolka_athome'] = 1
 		elseif hour = 21 and minut < 15:
 			!! Shower
-			kolloc = 10
-			kolloc['athome'] = 1
+			locat['Kolka'] = 10
+			locat['Kolka_athome'] = 1
 		elseif hour < 23:
 			!! Watches TV or games
-			kolloc = 11
-			kolloc['athome'] = 1
+			locat['Kolka'] = 11
+			locat['Kolka_athome'] = 1
 		else
 			!! Sleep
-			kolloc = 1
-			kolloc['athome'] = 0
+			locat['Kolka'] = 1
+			locat['Kolka_athome'] = 0
 		end
 	end
 end

locations/father.qsrc

@@ -57,9 +57,9 @@ if hcolfatherremember ! pcs_haircol:
 end
 
 ! tongue piercing
-if pirsA > 0 and pirsA < 10000 and pirsAfather=0 and pirsadaytalk!daystart:
-    pirseerand=rand(1,100)
-    pirsadaytalk=daystart
+if pirsA > 0 and pirsA < 10000 and pirsAfather = 0 and pirsadaytalk ! daystart:
+    pirseerand = rand(1,100)
+    pirsadaytalk = daystart
     if pirseerand >= 75:
         'Your stepfather looks at your mouth with a curious look as you greet him. "<<$pcs_nickname>>, do you have something shiny in your mouth?"'
         act'"No"':
@@ -71,12 +71,12 @@ if pirsA > 0 and pirsA < 10000 and pirsAfather=0 and pirsadaytalk!daystart:
         
         act'"Yes, would you like to see it?"':
             *clr & cla
-            pirsAfather=1
+            pirsAfather = 1
             gs'stat'
             '<center><img <<$set_imgh>> src="images/pc/body/piercings/a<<pirsA>>.jpg" ></center>'
             'You open your mouth and stick out your tongue and wiggle it at him showing him your piercing.'
-            if TouchedByFather=0:'Your stepfather shakes his head: "<<$pcs_nickname>>, tongue piercings are only for lewd women who use their mouth to please men."'
-            if TouchedByFather>0:'Your stepfather grins: "Nice, I bet you could make someone feel really good with that..."'
+            if TouchedByFather = 0:'Your stepfather shakes his head: "<<$pcs_nickname>>, tongue piercings are only for lewd women who use their mouth to please men."'
+            if TouchedByFather > 0:'Your stepfather grins: "Nice, I bet you could make someone feel really good with that..."'
             act 'Move away':gt $loc, $loc_arg
         end
         exit
@@ -84,18 +84,18 @@ if pirsA > 0 and pirsA < 10000 and pirsAfather=0 and pirsadaytalk!daystart:
 end
 
 ! lip piercing
-if pirsB > 0 and pirsB < 10000 and pirsBfather= 0 and pirsbdaytalk!daystart:
-    pirsadbytalk=daystart
+if pirsB > 0 and pirsB < 10000 and pirsBfather = 0 and pirsbdaytalk ! daystart:
+    pirsadbytalk = daystart
     'Your stepfather takes a long look at your mouth, specifically at your new piercing. He seems confused and asks: "Why did you get that?"'
     act '"Don''t you like it? I thought it looked kind of cute."':
         *clr & cla
-        pirsBfather=1
+        pirsBfather = 1
         gs'stat'
         '<center><img <<$set_imgh>> src="images/pc/body/piercings/b<<pirsB>>.jpg" ></center>'
         'You shrug. "I don''t know... I just like the way lip rings look, so I got one. Don''t you think it looks cute?"'
-        if TouchedByFather=0:'Your stepfather shakes his head: "Kids these days, always adding new holes to themselves..."'
+        if TouchedByFather = 0:'Your stepfather shakes his head: "Kids these days, always adding new holes to themselves..."'
 
-        if TouchedByFather>0:'Your stepfather grins: "I must admit, it does look sexy on you."'
+        if TouchedByFather > 0:'Your stepfather grins: "I must admit, it does look sexy on you."'
         act 'Move away':gt 'father'
     end
     exit
@@ -103,13 +103,13 @@ end
 
 ! earrings
 if pirsC > 0 and pirsC < 10000 and pirsCfather=0:
-    pirsCfather=1
+    pirsCfather = 1
     'Your stepfather looks at your ears, noting your earrings: "I see you got your ears pierced, Your earrings are very cute."'
 end
 
 ! nose ring
 if pirsD > 0 and pirsD < 10000 and pirsDfather=0:
-    pirsDfather=1
+    pirsDfather = 1
     'Your stepfather looks a bit shocked at your nose ring: "Jesus, <<$pcs_nickname>>, what is- why?! I understand putting a ring in a bull''s nose to lead them by, but on a person? There''s no reason to do that!"'
 end
 
@@ -123,8 +123,8 @@ end
 if tatlip>0 and fatherTatLip=0 and npc_rel['A28']>=60:
     act 'Show him your lip tattoo':
         *clr & cla
-        fatherTatLip=1
-        minut+=1
+        fatherTatLip = 1
+        minut += 1
         gs'stat'
         '<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip<<tatlip>>.jpg" ></center>'
         if tatlip = 2: $textFatherTatLip = 'A tattoo on the inside of your lip?! That must''ve hurt like hell... it is cute, though.'
@@ -163,8 +163,8 @@ end
 
 act 'Chat':
     *clr & cla
-    minut+=rand(10,15)
-    npc_rel['A28']+=1
+    minut += rand(10,15)
+    npc_rel['A28'] += 1
     gs 'stat'
     '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
     '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
@@ -218,7 +218,7 @@ if (hour > 10 and week < 6) or week >= 6:
                     act '"Oh please?"':
                         cla
 						menu_off = 1
-                        minut+=5
+                        minut += 5
                         gs 'stat'
                         pcs_horny += rand(1,5)
                         '"Oh come on, please Daddy?" you beg him, batting your eyelids and trying to look as cute as possible.'
@@ -307,17 +307,17 @@ if (hour > 10 and week < 6) or week >= 6:
         'Your stepfather notices the sharp smell of booze on you and looks disappointed. "<<$pcs_nickname>>, you smell like alcohol, what are you getting yourself into? You''re too young to drink that!"'
     end
 
-    if TorgVokzalTimes>0 and YouCanGar=0:
+    if TorgVokzalTimes>0 and YouCanGar = 0:
         act 'Ask him permission to store things in his garage':
             *clr & cla
 			menu_off = 1
-            minut+=5
+            minut += 5
             gs'stat'
             '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
             '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg" ></center>'
             'You ask your stepfather if it is okay for you to store some things in his garage.'
             if npc_rel['A28'] >= 60 or TouchedByFather = 1:
-                YouCanGar=1
+                YouCanGar = 1
                 'Your stepfather reluctantly agrees to let you store some things in his garage. You can hide some of your trinkets there now.'
             else
                 'Your stepfather shook his head and said "Sorry <<$pcs_nickname>>. The garage already has more stuff in it than I would like, there''s simply no room."'
@@ -352,7 +352,7 @@ if (hour > 10 and week < 6) or week >= 6:
             if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80:FatherMolest = rand(1,4)
             if npc_rel['A28'] >= 80:FatherMolest = rand(1,2)
 
-            if FatherMolest=1 and kolloc['athome'] = 0:
+            if FatherMolest = 1 and locat['Kolka_athome'] = 0:
                 pcs_horny += rand(1,5)
                 gs 'stat'
                 'He seems happy to oblige, and asks you to twirl your body so he can look at your outfit from all angles. The approving nod and hungry look in his eyes that follow, show that he would like to do more than just watch.'
@@ -369,7 +369,7 @@ if (hour > 10 and week < 6) or week >= 6:
                         if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
                         if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
 
-                        if fatherLust>=2:
+                        if fatherLust >= 2:
                             pcs_horny -= rand(1,5)
                             gs 'stat'
                             if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim47.jpg"></center>' & 'Even though your body is definitely having an effect on him your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable.'
@@ -395,7 +395,7 @@ if (hour > 10 and week < 6) or week >= 6:
                         end
                         act 'Move away':gt $loc, $loc_arg
                     end
-                    if fatherLust=1:'"Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he is, at least, pleasantly surprised by your request.'
+                    if fatherLust = 1:'"Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he is, at least, pleasantly surprised by your request.'
                 end
 
                 if pcs_horny >= 90 or TouchedByFather = 1:
@@ -412,14 +412,14 @@ if (hour > 10 and week < 6) or week >= 6:
                             if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
                             if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
 
-                            if fatherLust>=2:
+                            if fatherLust >= 2:
                                 pcs_horny -= rand(1,5)
                                 gs 'stat'
                                 '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim41.jpg"></center>'
                                 'Your stepfather clearly doesn''t want to, and is slightly embarrassed by the whole situation. He quickly pulls his hand away and tells you to go straighten your clothes.'
                             end
-                            if fatherLust=1:
-                                TouchedByFather=1
+                            if fatherLust = 1:
+                                TouchedByFather = 1
                                 if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim42.jpg"></center>' & 'Your stepfather smiles and eagerly reaches for your ass, kneading it rougher than you had anticipated. A bit startled at his roughness you squeak out a soft "Oh!" as he gives it a few slaps. He then sits back on the couch, amused at your embarrassed expression and red face. "You''re right, <<$pcs_nickname>>... it''s very soft indeed. Very nice."'
                                 if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim25.jpg"></center>' & 'Judging from your stepfather''s flustered face, he is more than happy to oblige. He grabs you and bends you over the rear of the couch. You can''t see what he''s doing, but immediately feel his hand brushing against your wet pussy. He slides a finger in and pumps it in and out for a little while, filling the room with squishy noises. You let out a needy moan and feel a tinge of regret when he pulls his hand away and helps you back up. "Daddy, you didn''t even touch my clothes!" you pout. He simply gives you a wink and then returns his attention to the TV.'
                             end
@@ -438,14 +438,14 @@ if (hour > 10 and week < 6) or week >= 6:
                             if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
                             if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
 
-                            if fatherLust>=2:
+                            if fatherLust >= 2:
                                 pcs_horny -= rand(1,5)
                                 gs 'stat'
                                 if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim45.jpg"></center>' & 'Your stepfather realizes you''re going too far, and interrupts you by clearing his throat loudly. He tells you to go away, making you feel rather uncomfortable.'
                                 if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim46.jpg"></center>' & 'Deciding to take your teasing to the next level, you pull your clothes to the side and show him your bare pussy. Your stepfather realizes you''re taking it too far, and sends you off: "<<$pcs_nickname>>, stop that. And go put on some underwear, that''s no way for a lady to behave."'
                             end
 
-                            if fatherLust=1:
+                            if fatherLust = 1:
                                 if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim43.jpg"></center>' & 'You run your hands over your shoulders and slide the straps off to the side, pretending it is an accident. "Oh no, I can be so clumsy sometimes!" you exclaim, while taking way longer than you need to put them back where they need to be. All the while your stepfather''s eyes are glued to your <<$titsize>> breasts, and his face turns beet red.'
                                 if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim44.jpg"></center>' & 'You''re not wearing any panties today, and decide to tease your stepfather with it. Moving over to the window you reach for the curtains and begin to rustle them, while the contours of your body are illuminated by the sun. Your clothes are so thin, your stepfather can clearly see the outline of your bare pussy through the semi-transparent clothes. You turn to face him and innocently say "Oh I''m sorry Daddy, I didn''t mean to disturb you. Should I go?" It takes him a few seconds to nod, but his greedy look tells you there are a lot of things he would want to do to you right here, right now.'
                             end
@@ -461,7 +461,7 @@ if (hour > 10 and week < 6) or week >= 6:
         end
     end
 
-	if sdadloc = 10:
+	if locat['Stepdad'] = 10:
 		act 'Watch TV together':
 			*clr & cla
 			menu_off = 1
@@ -494,7 +494,7 @@ if (hour > 10 and week < 6) or week >= 6:
 	end
 end
 
-if sdadloc = 10 and momloc['athome'] = 0 and kolloc['athome'] = 0 and TouchedByFather = 1 and (pcs_horny >= 50 or npc_sex['A28'] ! 0):
+if locat['Stepdad'] = 10 and locat['Mom_athome'] = 0 and locat['Kolka_athome'] = 0 and TouchedByFather = 1 and (pcs_horny >= 50 or npc_sex['A28'] ! 0):
     act 'Seduce him':
 		menu_off = 1
         if npc_rel['A28'] < 20:
@@ -549,7 +549,7 @@ if $clothingworntype = 'nude':
         end
     end
     if pirsF > 0 and pirsF < 10000 and PutsawpirsF = 0:
-        if npc_sex['A28']=0:
+        if npc_sex['A28'] = 0:
             if npc_rel['A28'] >= 60:
                 '"Hey, those look nice on you!" your stepfather says, nodding at your nipple piercings. He seems to like them.'
                 npc_rel['A28'] += 3
@@ -581,8 +581,8 @@ if $clothingworntype = 'nude':
     end
 
     'Your stepfather stares at your naked body, you can''t help but notice the admiring look on his face mixed with the torment of him knowing that he should know better. "<<$pcs_nickname>>, have you no shame? You shouldn''t be flaunting your naked body like that, you have no idea what kind of effect it has on men!"'
-	if momloc['athome'] = 1:$mother_go_text = '"You really should go put some clothes on though, your mother is home. Who knows what she''ll do when she sees you walking around like this!"'
-	if npc_sex['A28']=0:
+	if locat['Mom_athome'] = 1:$mother_go_text = '"You really should go put some clothes on though, your mother is home. Who knows what she''ll do when she sees you walking around like this!"'
+	if npc_sex['A28'] = 0:
         if npc_rel['A28'] >= 40 or hotcat > 5:
             '"You look fantastic," he says, reluctantly turning his face away from you. <<$mother_go_text>>'
 			npc_rel['A28'] += 1
@@ -596,7 +596,7 @@ if $clothingworntype = 'nude':
 	act 'Move away':gt 'bedrPar'
 end
 
-if npc_sex['A28']!0 and pirsG > 0 and pirsG < 10000 and PutsawpirsG = 0 and (hour <= 18 or hour > 21):
+if npc_sex['A28'] ! 0 and pirsG > 0 and pirsG < 10000 and PutsawpirsG = 0 and (hour <= 18 or hour > 21):
     act 'Show off your pubic piercing':
         *clr & cla
 		menu_off = 1        
@@ -613,7 +613,7 @@ end
 if npc_sex['A28']!0:fatherwantssex = rand(1,2)
 
 if $clothingworntype = 'nude': fatherwantssex = 1
-if npc_sex['A28']!0 and fatherwantssex = 1 and momloc['athome'] = 0 and kolloc['athome'] = 0 and npc_rel['A28'] > 60:
+if npc_sex['A28'] ! 0 and fatherwantssex = 1 and locat['Mom_athome'] = 0 and locat['Kolka_athome'] = 0 and npc_rel['A28'] > 60:
     *clr & cla
 	menu_off = 1
     gs 'stat'
@@ -621,7 +621,7 @@ if npc_sex['A28']!0 and fatherwantssex = 1 and momloc['athome'] = 0 and kolloc['
     '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
     ! WD: Fix old nude variable
     if $clothingworntype = 'nude': 'You give your stepfather a lewd smile. "I figured my clothes would only get in the way Daddy, so I took them off for you."'
-    'No words are neccessary, your stepfather simply unbuttons his pants revealing his stiff cock: "<<$pcs_nickname>>, help your old man out will you?"'
+    'No words are neccessary, your stepfather simply unbuttons his pants revealing his stiff cock. "<<$pcs_nickname>>, help your old man out will you?"'
     act 'Change your mind and leave':gt $loc, $loc_arg
     act 'Get down on your knees': gs 'fathersex', 'fatherblow4'
 end

locations/garfather.qsrc

@@ -20,7 +20,7 @@ dynamic $fatherRep
 
 act 'Leave': gt 'gargazel'
 
-if sdadloc ! 9:
+if locat['Stepdad'] ! 9:
 	msg 'Your Stepfather is no longer in the garage'
 	gt 'gargazel'
 end

locations/gargazel.qsrc

@@ -13,7 +13,7 @@ gs 'family_schedule'
 gs 'stat'
 '<center><h4>Garage</h4></center>'
 
-if sdadloc = 9:
+if locat['Stepdad'] = 9:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/gargazel.jpg"></center>'
 	'A large garage that belongs to your stepfather. He spends time in there working on his beloved Gazelle pickup truck whenever he can in the late afternoons and evenings. You can tell the door is not locked, he''s probably in there now.'
 else
@@ -21,7 +21,7 @@ else
 	'A large garage that belongs to your stepfather. He spends time in there working on his beloved Gazelle pickup truck whenever he can in the late afternoons and evenings. Right now the garage is closed, and the door is locked with a large padlock.'
 end
 
-if sdadloc = 9:
+if locat['Stepdad'] = 9:
 	if fatherdrunk = 1:
 		'Your <a href="exec:gt ''garfather''">stepfather and uncle Misha</a> are in the garage, drinking vodka.'
 	else

locations/gkafe.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = '':
 
 	act 'Leave':gt 'pav_market'
 
-	if (momloc = 7 or momloc = 9) and hour = 16 and indorf = 0 and mother_go = 1:
+	if (locat['Mother'] = 7 or locat['Mother'] = 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/korrPar.qsrc

@@ -46,8 +46,8 @@ if (hour ! 16 or hour ! 17) and blockBedrPar = 1:blockBedrPar = 0
 
 
 !!Her room isn''t on the cleaning list yet
-!!if (momloc = <number for cleaning her room> ) and motherQW['con_steal_hear'] + 4 < daystart and prezikday + 4 < daystart and rand(1,4) = 1: gt 'mother', 'condom_steal', 'hear'
-if momloc = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 < daystart and rand(1,4) = 1: gt 'mother', 'condom_steal', 'talk'
+!!if (locat['Mother'] = <number for cleaning her room> ) and motherQW['con_steal_hear'] + 4 < daystart and prezikday + 4 < daystart and rand(1,4) = 1: gt 'mother', 'condom_steal', 'hear'
+if locat['Mother'] = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 < daystart and rand(1,5) = 1: gt 'mother', 'condom_steal', 'talk'
 
 act '<b>Leave and go to the stairwell</b>':
 	if $clothingworntype ! 'nude':
@@ -76,16 +76,16 @@ act '<b>Leave and go to the courtyard</b>':
 end
 
 if blockBedrPar = 0:
-	if anyaloc = 11 and sisboytrioQW = 1:
+	if locat['Anya'] = 11 and sisboytrioQW = 1:
 		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom'
-	elseif anyaloc = 11 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] >= 9):
+	elseif locat['Anya'] = 11 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] >= 9):
 		act 'Go to your room':gt 'sisterQW', 'sisboyQW_bedroom'
 	else
 		act 'Go to your room':gt 'bedrPar'
 	end
 end
 
-if momloc = 3:
+if locat['Mother'] = 3:
 	act 'Knock on your parents'' door':
 		cla & *clr
 		minut += 2
@@ -103,7 +103,7 @@ if momloc = 3:
 			act 'Leave': gt 'sitrPar'
 		end
 	end
-elseif momloc = 1:
+elseif locat['Mother'] = 1:
 	if hour = 22 and parsexrand = 5 and parentsexday ! daystart:
 		act 'Go to your parents'' room': gt 'bedrPar2', 'peek'
 	else
@@ -115,27 +115,27 @@ end
 
 act 'Go to the living room':gt 'sitrPar'
 
-if momloc = 2:
+if locat['Mother'] = 2:
 	if vanrPar_suction_dildo > 0:
 		motherQW['dildo_shower_discovery'] = 1
 		gt'mother','bathroom_dildo_shriek1'
 	end
 	act 'Go to the bathroom':msg'You try to open the bathroom door, but it immediately stops and bangs against the latch. You hear the water running and your mother shouting at the door. "Doesn''t anybody in this family know how to knock?!"'
-elseif sdadloc = 5 and sdadloc = 11:
-	if sdadloc = 5:
+elseif locat['Stepdad'] = 5 and locat['Stepdad'] = 11:
+	if locat['Stepdad'] = 5:
 		act 'Go to the bathroom':msg'You try to open the bathroom door, but it immediately stops and bangs against the latch. You hear your stepfather say "I''m shaving right now, be out in a few minutes."'
 	else
 		act 'Go to the bathroom':msg'You try to open the bathroom door, but it immediately stops and bangs against the latch. You hear the water running and your stepfather shout "I''m in the shower!"'
 	end
-elseif kolloc = 10:
+elseif locat['Kolka'] = 10:
 	act 'Go to the bathroom':msg'You try to open the bathroom door, but it immediately stops and bangs against the latch. You hear the water running and your brother shout "I''m in the shower!"'
-elseif anyaloc = 5:
+elseif locat['Anya'] = 5:
 	act 'Go to the bathroom':msg'You try to open the bathroom door, but it immediately stops and bangs against the latch. You hear the water running and your sister yell "I''ll be done in a few minutes!"'
 else
 	act 'Go to the bathroom':minut += 1 & gt 'vanrPar'
 end
 
-if motherQW['bathroom_dildos'] > 0 and momloc['athome'] = 1: gt'mother_sextalk','bathroom_dildos1'
+if motherQW['bathroom_dildos'] > 0 and locat['Mom_athome'] = 1: gt'mother_sextalk','bathroom_dildos1'
 
 act 'Go to the kitchen':gt 'kuhrPar'
 
@@ -446,7 +446,7 @@ elseif motherWorry = 1 and indorf > 0:
 	motherWorry = 0
 end
 
-if notathomesleep > 7 and hour >= 16 and hour < 21 and momloc['athome'] = 1:
+if notathomesleep > 7 and hour >= 16 and hour < 21 and locat['Mom_athome'] = 1:
 	notathomesleep = 0
 	*clr & cla
 	*pl $korrParMomHeader

locations/kuhrPar.qsrc

@@ -30,10 +30,10 @@ gs 'family_schedule'
 '<center><b><font color="maroon">Kitchen</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
 
-if momloc = 4:
-	if momloc['kitchen_action'] = 1:
+if locat['Mother'] = 4:
+	if locat['Mom_kitchen_action'] = 1:
 		'You <<$npc_nickname[''A29'']>> is here, busy making breakfast.'
-	elseif momloc['kitchen_action'] = 2:
+	elseif locat['Mom_kitchen_action'] = 2:
 		npc_rel['A29'] += 1
 		cla & *clr
 		minut += 5
@@ -42,7 +42,7 @@ if momloc = 4:
 		'Your <<$npc_nickname[''A29'']>> turns to you. "<<$pcs_nickname>>, please set the table for breakfast." You sigh and grab the dishes.'
 		act 'Set the table for breakfast': gt 'kuhrPar'
 		exit
-	elseif momloc['kitchen_action'] = 4:
+	elseif locat['Mom_kitchen_action'] = 4:
 		$mombreak = ''
 		'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here clearing away the breakfast dishes.'
 	else
@@ -54,23 +54,23 @@ if (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week < 6 and ind
 	'<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:
 	'<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 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.'
 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.'
 end
-if momloc = 11: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here making diner.'
-if momloc = 13 and anyaloc = 23: 
+if locat['Mother'] = 11: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here making diner.'
+if locat['Mother'] = 13 and locat['Anya'] = 23: 
 	'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after dinner with <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> helping her. '
-elseif momloc = 13:
+elseif locat['Mother'] = 13:
 	'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after dinner.'
 end
-if momloc = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning.'
+if locat['Mother'] = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning.'
 
-if sdadloc = 4: '<a href="exec:gt''father''">Your stepfather</a> is here reading the paper.'
-if sdadloc = 7: '<a href="exec:gt''father''">Your stepfather</a> is here setting the table for dinner.'
+if locat['Stepdad'] = 4: '<a href="exec:gt''father''">Your stepfather</a> is here reading the paper.'
+if locat['Stepdad'] = 7: '<a href="exec:gt''father''">Your stepfather</a> is here setting the table for dinner.'
 
 if week = 6 and dostupindorf = 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.'
 
@@ -131,7 +131,7 @@ elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0:
 				'You''re about to respond when your mother interrupts you. "Of course not! She''s still too young to be thinking about boys!"'
 				'Kolka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
 				'You mother turns towards Kolka. "That''s not funny! Apologize to your sister right now! Right now!"' 
-				if anyaloc = 12:
+				if locat['Anya'] = 12:
 					'Anya smirks as Kolka freezes in place and decides he doesn''t want to be the one to tell her about your reputation and just apologizes to you.'
 				else
 					'Kolka freezes in place and decides he doesn''t want to be the one to tell her about your reputation and just apologizes to you.'
@@ -141,7 +141,7 @@ elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0:
 				'You''re about to respond when your mother interrupts you. "She''s too young to worry about that and... we talked about it." She gives you a meaningful glance and you shut your mouth.'
 				'Kolka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
 				'You mother turns towards Kolka. "That''s not funny!" She then glances at you. "She might have made some mistakes, but she''s trying to be a better girl now. Now apologize to your sister right now!"' 
-				if anyaloc = 12:
+				if locat['Anya'] = 12:
 					'Anya just smirks as Kolka freezes in place and then apologizes to you.'
 				else
 					'Startled, Kolka freezes in place and then apologizes to you.'

locations/lariska_schedule.qsrc

@@ -1,295 +1,297 @@
 # lariska_schedule
+!! 2022/06/04 - Alaratt
 
-lariloc = 0
-
-!! lariloc['athome'] = 1 means Lariska is not only home, but available to answer the door if you knock
+locat['Lariska'] = 0
+locat['Lariska'] = 0
+locat['Lari_athome'] = 0
+!! locat['Lari_athome'] = 1 means Lariska is not only home, but available to answer the door if you knock
 
 if SchoolAtestat = 0 and kanikuli = 0:
 	if week <= 5:
 		if (hour < 6) or (hour = 6 and minut < 45):
 			!!Bedroom - Asleep
-			lariloc = 1
-			lariloc['athome'] = 0
+			locat['Lariska'] = 1
+			locat['Lari_athome'] = 0
 		elseif hour < 7:
 			!!Bedroom - Getting Dressed
-			lariloc = 2
-			lariloc['athome'] = 1
+			locat['Lariska'] = 2
+			locat['Lari_athome'] = 1
 		elseif hour = 7 and minut <= 15:
 			!!Kitchen - Breakfast
-			lariloc = 3
-			lariloc['athome'] = 1
+			locat['Lariska'] = 3
+			locat['Lari_athome'] = 1
 		elseif hour = 7 and minut < 30:
 			!!NotHome - Walking to school
-			lariloc = 4
-			lariloc['athome'] = 0
+			locat['Lariska'] = 4
+			locat['Lari_athome'] = 0
 		elseif hour < 14:
 			!!NotHome - At School
-			lariloc = 5
-			lariloc['athome'] = 0
+			locat['Lariska'] = 5
+			locat['Lari_athome'] = 0
 		elseif hour < 16:
 			if (week = 2 or week = 4) and (month >= 10 or month <= 5):
 				!!NotHome - Cheerleader Practice
-				lariloc = 6
-				lariloc['athome'] = 0
+				locat['Lariska'] = 6
+				locat['Lari_athome'] = 0
 			elseif week = 5 and odd_week = 1 and (month >= 10 or month <= 5):
 				!!NotHome - Game Night
-				lariloc = 7
-				lariloc['athome'] = 0
+				locat['Lariska'] = 7
+				locat['Lari_athome'] = 0
 			else
 				if lernHome > 0:
 					!!Bedroom - Homework
-					lariloc = 8
-					lariloc['athome'] = 1
+					locat['Lariska'] = 8
+					locat['Lari_athome'] = 1
 				else
 					!!Bedroom - Hanging Out
-					lariloc = 22
-					lariloc['athome'] = 1
+					locat['Lariska'] = 22
+					locat['Lari_athome'] = 1
 				end
 			end
 		elseif hour < 18:
 			if cheerleaders_on = 1:
 				!!Bedroom - Hanging Out
-				lariloc = 22
-				lariloc['athome'] = 1
+				locat['Lariska'] = 22
+				locat['Lari_athome'] = 1
 			else
 				!!NotHome - Community Center
-				lariloc = 9
-				lariloc['athome'] = 0
+				locat['Lariska'] = 9
+				locat['Lari_athome'] = 0
 			end
 		elseif hour = 18 and minut < 30:
 			!!Kitchen - Cooking Dinner
-			lariloc = 11
-			lariloc['athome'] = 1
+			locat['Lariska'] = 11
+			locat['Lari_athome'] = 1
 		elseif hour <= 19:
 			!!Kitchen - Eating Dinner
-			lariloc = 12
-			lariloc['athome'] = 1
+			locat['Lariska'] = 12
+			locat['Lari_athome'] = 1
 		elseif hour = 19 and minut <= 30:
 			!!Bathroom - Shower
-			lariloc = 13
-			lariloc['athome'] = 0
+			locat['Lariska'] = 13
+			locat['Lari_athome'] = 0
 		elseif hour < 21:
 			!!Living Room - Watching TV
-			lariloc = 14
-			lariloc['athome'] = 1
+			locat['Lariska'] = 14
+			locat['Lari_athome'] = 1
 		else
 			!!Bedroom - Reading in bed
-			lariloc = 15
-			lariloc['athome'] = 0
+			locat['Lariska'] = 15
+			locat['Lari_athome'] = 0
 		end
 	elseif week = 6:
 		if hour < 9:
 			!!Bedroom - Asleep
-			lariloc = 1
-			lariloc['athome'] = 0
+			locat['Lariska'] = 1
+			locat['Lari_athome'] = 0
 		elseif hour = 9 and minut <= 15:
 			!!Kitchen - Breakfast
-			lariloc = 3
-			lariloc['athome'] = 1
+			locat['Lariska'] = 3
+			locat['Lari_athome'] = 1
 		elseif (hour < 11) or (hour = 11 and minut < 15):
 			!!Living Room - Working Out
-			lariloc = 16
-			lariloc['athome'] = 1
+			locat['Lariska'] = 16
+			locat['Lari_athome'] = 1
 		elseif hour = 11 and minut < 45:
 			!!Bathroom - Shower
-			lariloc = 13
-			lariloc['athome'] = 1
+			locat['Lariska'] = 13
+			locat['Lari_athome'] = 1
 		elseif hour < 12:
 			!!Bedroom - Getting Dressed
-			lariloc = 2
-			lariloc['athome'] = 1
+			locat['Lariska'] = 2
+			locat['Lari_athome'] = 1
 		elseif (hour < 17) or (hour = 17 and minut < 45):
 			!!Bedroom - Hanging Out
-			lariloc = 22
-			lariloc['athome'] = 1
+			locat['Lariska'] = 22
+			locat['Lari_athome'] = 1
 		elseif hour = 17 and minut > 45:
 			if LariskaQW['volleyball'] = 1:
 				!!!!NotHome - Community Center - Volleyball Game
-				lariloc = 21
-				lariloc['athome'] = 0
+				locat['Lariska'] = 21
+				locat['Lari_athome'] = 0
 			else
 				!!Living Room - Watching TV
-				lariloc = 14
-				lariloc['athome'] = 1
+				locat['Lariska'] = 14
+				locat['Lari_athome'] = 1
 			end
 		elseif hour = 22 and minut <= 30:
 			!!Kitchen - Dinner
-			lariloc = 12
-			lariloc['athome'] = 1
+			locat['Lariska'] = 12
+			locat['Lari_athome'] = 1
 		elseif hour < 23:
 			!!Bathroom - Shower
-			lariloc = 13
-			lariloc['athome'] = 1
+			locat['Lariska'] = 13
+			locat['Lari_athome'] = 1
 		else
 			!!Bedroom - Reading in bed
-			lariloc = 15
-			lariloc['athome'] = 0
+			locat['Lariska'] = 15
+			locat['Lari_athome'] = 0
 		end
 	else
 		if hour < 9:
 			!!Bedroom - Asleep
-			lariloc = 1
-			lariloc['athome'] = 0
+			locat['Lariska'] = 1
+			locat['Lari_athome'] = 0
 		elseif hour = 9 and minut <= 15:
 			!!Kitchen - Breakfast
-			lariloc = 3
-			lariloc['athome'] = 1
+			locat['Lariska'] = 3
+			locat['Lari_athome'] = 1
 		elseif (hour < 11) or (hour = 11 and minut < 15):
 			!!Living Room - Working Out
-			lariloc = 16
-			lariloc['athome'] = 1
+			locat['Lariska'] = 16
+			locat['Lari_athome'] = 1
 		elseif hour = 11 and minut < 45:
 			!!Bathroom - Shower
-			lariloc = 13
-			lariloc['athome'] = 0
+			locat['Lariska'] = 13
+			locat['Lari_athome'] = 0
 		elseif hour < 12:
 			!!Bedroom - Getting Dressed
-			lariloc = 2
-			lariloc['athome'] = 1
+			locat['Lariska'] = 2
+			locat['Lari_athome'] = 1
 		elseif hour = 12 and minut < 30:
 			!!Bedroom - Cleaning
-			lariloc = 17
-			lariloc['athome'] = 1
+			locat['Lariska'] = 17
+			locat['Lari_athome'] = 1
 		elseif hour < 13:
 			!!Living Room - Cleaning
-			lariloc = 18
-			lariloc['athome'] = 1
+			locat['Lariska'] = 18
+			locat['Lari_athome'] = 1
 		elseif hour = 13 and minut < 30:
 			!!Kitchen - Cleaning
-			lariloc = 19
-			lariloc['athome'] = 1
+			locat['Lariska'] = 19
+			locat['Lari_athome'] = 1
 		elseif hour < 14:
 			!!Bathroom - Cleaning
-			lariloc = 20
-			lariloc['athome'] = 1
+			locat['Lariska'] = 20
+			locat['Lari_athome'] = 1
 		elseif hour < 20:
 			!!Bedroom - Hanging Out
-			lariloc = 22
-			lariloc['athome'] = 1
+			locat['Lariska'] = 22
+			locat['Lari_athome'] = 1
 		elseif hour < 22:
 			!!Living Room - Watching TV
-			lariloc = 14
-			lariloc['athome'] = 1
+			locat['Lariska'] = 14
+			locat['Lari_athome'] = 1
 		elseif hour = 22 and minut <= 30:
 			!!Kitchen - Dinner
-			lariloc = 13
-			lariloc['athome'] = 0
+			locat['Lariska'] = 13
+			locat['Lari_athome'] = 0
 		elseif hour < 23:
 			!!Bathroom - Shower
-			lariloc = 13
-			lariloc['athome'] = 0
+			locat['Lariska'] = 13
+			locat['Lari_athome'] = 0
 		else
 			!!Bedroom - Reading in bed
-			lariloc = 15
-			lariloc['athome'] = 0
+			locat['Lariska'] = 15
+			locat['Lari_athome'] = 0
 		end
 	end
 else
 	if week <= 6:
 		if hour < 9:
 			!!Bedroom - Asleep
-			lariloc = 1
-			lariloc['athome'] = 0
+			locat['Lariska'] = 1
+			locat['Lari_athome'] = 0
 		elseif hour = 9 and minut < 15:
 			!!Kitchen - Breakfast
-			lariloc = 3
-			lariloc['athome'] = 1
+			locat['Lariska'] = 3
+			locat['Lari_athome'] = 1
 		elseif (hour < 11) or (hour = 11 and minut < 15):
 			!!Living Room - Working Out
-			lariloc = 16
-			lariloc['athome'] = 1
+			locat['Lariska'] = 16
+			locat['Lari_athome'] = 1
 		elseif hour = 11 and minut < 45:
 			!!Bathroom - Shower
-			lariloc = 13
-			lariloc['athome'] = 0
+			locat['Lariska'] = 13
+			locat['Lari_athome'] = 0
 		elseif hour < 12:
 			!!Bedroom - Getting Dressed
-			lariloc = 2
-			lariloc['athome'] = 1
+			locat['Lariska'] = 2
+			locat['Lari_athome'] = 1
 		elseif (hour < 17) or (hour = 17 and minut < 45):
 			!!Bedroom - Hanging Out
-			lariloc = 22
-			lariloc['athome'] = 1
+			locat['Lariska'] = 22
+			locat['Lari_athome'] = 1
 		elseif hour < 22:
 			!!Living Room - Watching TV
-			lariloc = 14
-			lariloc['athome'] = 1
+			locat['Lariska'] = 14
+			locat['Lari_athome'] = 1
 		elseif hour = 22 and minut <= 30:
 			!!Kitchen - Dinner
-			lariloc = 12
-			lariloc['athome'] = 1
+			locat['Lariska'] = 12
+			locat['Lari_athome'] = 1
 		elseif hour < 23:
 			!!Bathroom - Shower
-			lariloc = 13
+			locat['Lariska'] = 13
 			if week = 6:
 				!!Anna can answer the door and let you in
-				lariloc['athome'] = 1
+				locat['Lari_athome'] = 1
 			else
 				!!Anna is not home to answer the door
-				lariloc['athome'] = 0
+				locat['Lari_athome'] = 0
 			end
 		else
 			!!Bedroom - Reading in bed
-			lariloc = 15
-			lariloc['athome'] = 0
+			locat['Lariska'] = 15
+			locat['Lari_athome'] = 0
 		end
 	else
 		if hour < 9:
 			!!Bedroom - Asleep
-			lariloc = 1
-			lariloc['athome'] = 0
+			locat['Lariska'] = 1
+			locat['Lari_athome'] = 0
 		elseif hour = 9 and minut <= 15:
 			!!Kitchen - Breakfast
-			lariloc = 3
-			lariloc['athome'] = 1
+			locat['Lariska'] = 3
+			locat['Lari_athome'] = 1
 		elseif (hour < 11) or (hour = 11 and minut < 15):
 			!!Living Room - Working Out
-			lariloc = 16
-			lariloc['athome'] = 1
+			locat['Lariska'] = 16
+			locat['Lari_athome'] = 1
 		elseif hour = 11 and minut < 45:
 			!!Bathroom - Shower
-			lariloc = 13
-			lariloc['athome'] = 1
+			locat['Lariska'] = 13
+			locat['Lari_athome'] = 1
 		elseif hour < 12:
 			!!Bedroom - Getting Dressed
-			lariloc = 2
-			lariloc['athome'] = 1
+			locat['Lariska'] = 2
+			locat['Lari_athome'] = 1
 		elseif hour = 12 and minut < 30:
 			!!Bedroom - Cleaning
-			lariloc = 17
-			lariloc['athome'] = 1
+			locat['Lariska'] = 17
+			locat['Lari_athome'] = 1
 		elseif hour < 13:
 			!!Living Room - Cleaning
-			lariloc = 18
-			lariloc['athome'] = 1
+			locat['Lariska'] = 18
+			locat['Lari_athome'] = 1
 		elseif hour = 13 and minut < 30:
 			!!Kitchen - Cleaning
-			lariloc = 19
-			lariloc['athome'] = 1
+			locat['Lariska'] = 19
+			locat['Lari_athome'] = 1
 		elseif hour < 14:
 			!!Bathroom - Cleaning
-			lariloc = 20
-			lariloc['athome'] = 1
+			locat['Lariska'] = 20
+			locat['Lari_athome'] = 1
 		elseif hour < 20:
 			!!Bedroom - Hanging Out
-			lariloc = 22
-			lariloc['athome'] = 1
+			locat['Lariska'] = 22
+			locat['Lari_athome'] = 1
 		elseif hour < 22:
 			!!Living Room - Watching TV
-			lariloc = 14
-			lariloc['athome'] = 1
+			locat['Lariska'] = 14
+			locat['Lari_athome'] = 1
 		elseif hour = 22 and minut <= 30:
 			!!Kitchen - Dinner
-			lariloc = 12
-			lariloc['athome'] = 1
+			locat['Lariska'] = 12
+			locat['Lari_athome'] = 1
 		elseif hour < 23:
 			!!Bathroom - Shower
-			lariloc = 13
-			lariloc['athome'] = 1
+			locat['Lariska'] = 13
+			locat['Lari_athome'] = 1
 		else
 			!!Bedroom - Reading in bed
-			lariloc = 15
-			lariloc['athome'] = 0
+			locat['Lariska'] = 15
+			locat['Lari_athome'] = 0
 		end
 	end
 end

locations/ludahome.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'home':
 		!! Luda and Olu are home Monday-Thursday from 18:00 to 23:00 or 08:00 to 23:00 on the weekends. Always at home between 19-22 on Mon when Sveta''s mom visits
 		!! 30% of the time they''re both home, 30% it''s only Luda, 30% it''s only Olu. Otherwise no one is home
 		gs 'family_schedule'
-		if momloc = 20:
+		if locat['Mother'] = 20:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
 			'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face. "Hello again," he says in heavily accented Russian. When he sees it is you, his smile turns into a hungry grin as his eyes roam all over you body.'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'textanya':
 	'The two of you sit down on the couch while, you send Anya a text "Hey what are you doing?"'
 	!! This is very much EXPERIMENTAL so 1. needs to be adjusted if anya''s schedule changes and 2. might be incorrect
 	gs 'family_schedule'
-	if anyaloc < 9 or anyaloc > 15: OluQW['anya_busy'] = daystart
+	if locat['Anya'] < 9 or locat['Anya'] > 15: OluQW['anya_busy'] = daystart
 	if OluQW['anya_busy'] = daystart:
 		'You wait a little bit before you get a reply "Busy, why?"'
 		'You sigh and reply "Nothing, I''ll talk to you later."'
@@ -215,7 +215,7 @@ if $ARGS[0] = 'textanya':
 			act 'Sit down and chat':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
-				'You make a bit of small talk, asking him about his recent work and telling him about some of the stuff that happened in school recently and everything seems to be going well. Then he suddenly stands up "Can you excuse me a moment, I was just about to take a shower before you arrived. I will be right back." With that he suddenly walks out of the room and you can hear the bathroom door close. You find it rather odd but you could sit and wait for him to finish his shower or you could just leave and come back some other time.'
+				'You make a bit of small talk, asking him about his recent work and telling him about some of the stuff that happened in school recently and everything seems to be going well. Then he suddenly stands up. "Can you excuse me a moment, I was just about to take a shower before you arrived. I will be right back." With that he suddenly walks out of the room and you can hear the bathroom door close. You find it rather odd but you could sit and wait for him to finish his shower or you could just leave and come back some other time.'
 				act 'Leave': gt 'pod_ezd', 'etaj_4'
 				act 'Wait for him to return': gt 'olu', 'seduction'
 			end
@@ -228,9 +228,9 @@ if $ARGS[0] = 'textanya':
 		'You wait a little bit before you get a reply "Nothing, why?"'
 		'You smile and reply "Want to come up to Aunt Luda''s and have some fun with Olu?"'
 		'You wait a little bit to get the reply "Sure! Be right up."'
-		'You glance up to Olu and say, with a smile "Anya is on her way."'
-		'He looks a little surprised "Your sister?"'
-		'You nod and smile "Yeah she wants to have fun with you, after I told her about you." You could swear he just blushed.'
+		'You glance up to Olu and say with a smile, "Anya is on her way."'
+		'He looks a little surprised. "Your sister?"'
+		'You nod and smile. "Yeah she wants to have fun with you, after I told her about you." You could swear he just blushed.'
 		act 'Wait for Anya': gt 'olu', 'oluanya'
 	end
 end
@@ -419,13 +419,13 @@ if $ARGS[0] = 'livingroom':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/ludahome/living.jpg"></center>'
 	'The living room is clean and neat. A couch rests against one wall, with an entertainment center on the opposite wall that holds a fairly decent sized flat screen TV along with a DVD player. Inside one of the glass doors of the entertainment center you see several dozen DVD''s.'
 	gs 'family_schedule'
-	if momloc = 20 and OluLoc = 5:
+	if locat['Mother'] = 20 and OluLoc = 5:
 		'Olu is sitting on the couch watching some sports and he seems pretty intent on it. When he notices you, he briefly looks up and smiles at you as you walk back in.'
 		act 'Watch TV with him (0:30)': gt 'ludahome', 'watchtv'
 	elseif LudaLoc = 5 and OluLoc = 5:
 		'Luda and Olu are still sitting on the couch where you left them. Still watching TV, right where they was, when you got up to explore their apartment. Luda glances up and smiles at you as you walk back in.'
 		act 'Watch TV with them (0:30)': gt 'ludahome', 'watchtv'
-	elseif LudaLoc = 5 and momloc ! 20:
+	elseif LudaLoc = 5 and locat['Mother'] ! 20:
 		'Luda is still sitting on the couch where you left her, when you got up to explore her apartment. She smiles at you as you walk back in.'
 		act 'Sit down and chat': gt 'ludahome', 'chat_luda'
 	elseif OluLoc = 5:
@@ -441,7 +441,7 @@ if $ARGS[0] = 'watchtv':
 	if $ARGS[1] = '':
 		*clr & cla
 		minut += 30
-		if momloc = 20:
+		if locat['Mother'] = 20:
 			gs 'npc_relationship', 'modify', 'A55', 'like'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/ludahome/olutv.jpg"></center>'
 			'You take a seat on the couch next to Olu, he offers you a brief smile, but his attention seems to be focused on a football game. You are not sure if this is a recording or a live game, but he is really into it. You watch it with him for about half a hour, he occasional shouts at the TV either in joy or anger as one team or the other scores. After a bit you realize he doesn''t seem interested in talking.'
@@ -453,7 +453,7 @@ if $ARGS[0] = 'watchtv':
 		end
 		gs 'stat'
 		act 'Stop watching TV': gt 'ludahome', 'livingroom'
-		act 'Keep watching TV (0:30)': gt 'ludahome', 'watchtv', iif(momloc = 20, 'Olu','OluLuda')
+		act 'Keep watching TV (0:30)': gt 'ludahome', 'watchtv', iif(locat['Mother'] = 20, 'Olu','OluLuda')
 	elseif $ARGS[1] = 'Olu':
 		*clr & cla
 		minut += 30
@@ -506,7 +506,7 @@ if $ARGS[0] = 'kitchen':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/ludahome/kitchen.jpg"></center>'
 	'Along one wall is the kitchen counters, with a stove, fridge, and sink. On the counter is a microwave, opposite the counters is a small table with chairs. The room is fairly clean but looks lived in and used, there is a couple of small racks with what looks to be spices, some of them seem to be foreign and you don''t really know what they are.'
 	gs 'family_schedule'
-	if momloc = 20:
+	if locat['Mother'] = 20:
 		'Luda and your <<$npc_nickname[''A29'']>> are sitting at the kitchen table chatting away and drink tea.'+iif(LudaQW['tea_day'] ! daystart,' When she hears you, Luda turns your way and asks "Would you like to join us, dear?"','')
 		act 'Join them for tea (0:30)': gt 'ludahome', 'luda_mom_talk'
 		if LudaQW['tea_day'] ! daystart:

locations/mother_sextalk.qsrc

@@ -347,9 +347,9 @@ if $ARGS[0] = 'bathroom_dildos3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
 	'As you step into the hall of your family home, you see your mother is there waiting for you. She looks more exasperated than angry.'
 	'"Again, <<$pcs_firstname>>?" She sighs and tosses your sex toy at you and puts a hand to her forehead. "God, I hope you washed everything before I touched it. I''m not going to throw it away this time because I know you''re just going to buy more. But please <<$pcs_nickname>>. Think of your brother and father. Stop leaving stuff like this lying around."'
-	if momloc = 11 or momloc = 12:
+	if locat['Mother'] = 11 or locat['Mother'] = 12:
 		'With that she walks off into the kitchen.'
-	elseif momloc = 13:
+	elseif locat['Mother'] = 13:
 		'With that she walks off into the living room where you hear your stepfather watching TV.'
 	end
 	act'Continue':gt $loc, $loc_arg
@@ -366,9 +366,9 @@ if $ARGS[0] = 'bathroom_dildos4':
 	'"I want you to know that I found your whore things that you left in the bathroom." You look at her in confusion for a moment.'
 	'"What thi-" and then it hits you. Oh shit, you left your dildo in the bathroom.'
 	'"I also want you to know that I threw them out. If you want to be a slut, you can go do it somewhere else."'
-	if momloc = 11 or momloc = 12:
+	if locat['Mother'] = 11 or locat['Mother'] = 12:
 		'With that she walks off into the kitchen.'
-	elseif momloc = 13:
+	elseif locat['Mother'] = 13:
 		'With that she walks off into the living room where you hear your stepfather watching TV.'
 	end
 	act'Continue':gt $loc, $loc_arg
@@ -385,9 +385,9 @@ if $ARGS[0] = 'bathroom_dildos5':
 	'"I want you to know that I found your whore things that you left in the bathroom." She glares at you. "Again."'
 	'"... did you throw them awa-"'
 	'"<i>Yes.</i> Obviously. I can''t believe that you''re such a whore now, leaving things like that around for your family to find. Do you have no conscience at all?" She sighs deeply. "My daughter is a shameless slut... What am I going to do..."'
-	if momloc = 11 or momloc = 12:
+	if locat['Mother'] = 11 or locat['Mother'] = 12:
 		'With that she walks off into the kitchen.'
-	elseif momloc = 13:
+	elseif locat['Mother'] = 13:
 		'With that she walks off into the living room where you hear your stepfather watching TV.'
 	end
 	act'Continue':gt $loc, $loc_arg

locations/pav_aptcourtev.qsrc

@@ -248,7 +248,7 @@ if $ARGS[0] = 'events1':
 		text_rand = rand(0,2)
 		if text_rand = 1 and mid($start_type,1,2) = 'sg' and (week > 5 or hour >= 14):
 			'You see, between two of the storage buildings, Lena squatting down before Lavrenti as she sucks his dick. Lena seems to be enjoying this almost as much as Lavrenti is enjoying getting the blowjob. After a few minutes, you hear him moan, his cock never leaving her mouth. She continues to milk him for another minute before standing up and the two walk off together. You wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him, knowing his reputation, when it comes to his sister.'
-		elseif text_rand = 2 and mid($start_type,1,2) = 'sg' and (anyaloc = 9 or anyaloc = 13 or anyaloc = 14 or anyaloc = 24) and (sisterQW['AnyaRomaQW'] = 0 or sisterQW['partytalk'] > 0):
+		elseif text_rand = 2 and mid($start_type,1,2) = 'sg' and (locat['Anya'] = 9 or locat['Anya'] = 13 or locat['Anya'] = 14 or locat['Anya'] = 24) and (sisterQW['AnyaRomaQW'] = 0 or sisterQW['partytalk'] > 0):
 			'You spot a guy you think you recognize leaning against a wall near the storage buildings, but it''s hard to tell, his face is turned to the side and tilted down. There''s a girl kneeling in front of him, giving him one heck of an enthusiastic blowjob. You move more to the side of them to get a better view and realize it is Roma, your sister boyfriend and... Oh god! It''s your sister! She is sucking him for all she is worth, taking his dick all the way down her throat. Part of you knows you shouldn''t watch, but another part of you cannot look away. Where did your sister get those sucking skills? Can she teach you?'
 			*nl
 			'You''re pulled out of your thoughts when you hear Roma moan, his hand gripping the back of Anya''s head as he cums hard in her mouth. Anya doesn''t resist and continues to suck, even after Roma removes his hand from her head. She sucks every drop from him, sucking his cock clean, before standing up. You instinctively duck, hoping you''re not noticed. They briefly kiss and then turn and walk away hand in hand.'
@@ -405,7 +405,7 @@ if $ARGS[0] = 'events2':
 		text_rand = rand(0,2)
 		if text_rand = 1 and mid($start_type,1,2) = 'sg' and ((week > 5 and hour < 4) or hour < 7):
 			'You see, between two of the storage buildings, Lena squatting down before Lavrenti as she sucks his dick. Lena seems to be enjoying this almost as much as Lavrenti is enjoying getting the blowjob. After a few minutes, you hear him moan, his cock never leaving her mouth. She continues to milk him for another minute before standing up and the two walk off together. You wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him, knowing his reputation, when it comes to his sister.'
-		elseif text_rand = 2 and mid($start_type,1,2) = 'sg' and (anyaloc = 9 or anyaloc = 13 or anyaloc = 14 or anyaloc = 24) and (sisterQW['AnyaRomaQW'] = 0 or sisterQW['partytalk'] > 0):
+		elseif text_rand = 2 and mid($start_type,1,2) = 'sg' and (locat['Anya'] = 9 or locat['Anya'] = 13 or locat['Anya'] = 14 or locat['Anya'] = 24) and (sisterQW['AnyaRomaQW'] = 0 or sisterQW['partytalk'] > 0):
 			'You spot a guy you think you recognize leaning against a wall near the storage buildings, but it''s hard to tell, his face is turned to the side and tilted down. There''s a girl kneeling in front of him, giving him one heck of an enthusiastic blowjob. You move more to the side of them to get a better view and realize it is Roma, your sister boyfriend and... Oh god! It''s your sister! She is sucking him for all she is worth, taking his dick all the way down her throat. Part of you knows you shouldn''t watch, but another part of you cannot look away. Where did your sister get those sucking skills? Can she teach you?'
 			*nl
 			'You''re pulled out of your thoughts when you hear Roma moan, his hand gripping the back of Anya''s head as he cums hard in her mouth. Anya doesn''t resist and continues to suck, even after Roma removes his hand from her head. She sucks every drop from him, sucking his cock clean, before standing up. You instinctively duck, hoping you''re not noticed. They briefly kiss and then turn and walk away hand in hand.'

locations/pav_church.qsrc

@@ -305,7 +305,7 @@ if $ARGS[0] = 'Narthex':
 	*clr & cla
 	gs 'themes', 'indoors'
 	gs 'family_schedule'
-	if momloc = 16 and mom_church ! daystart: gt 'pav_church', 'Mom'
+	if locat['Mother'] = 16 and mom_church ! daystart: gt 'pav_church', 'Mom'
 	gs 'stat'
 	PLAY 'sound/church/76139__dkustic__090227-01-people-church-concert.wav',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/enterchurch.jpg"></center>'

locations/salon.qsrc

@@ -1,8 +1,7 @@
 # salon
-$location_type = 'public_indoors'
+
 
 if $ARGS[0] = 'start':
-	if momloc = 15 and momloc[11] ! daystart: gt 'salon', 'mom'
 	$sexloc = $CURLOC
 	cla & *clr
 	$menu_loc = 'salon'
@@ -11,11 +10,15 @@ if $ARGS[0] = 'start':
 	$loc_arg = 'start'
 	menu_off = 0
 	salonrand = rand(0, 9)
-	gs 'stat'
+	$location_type = 'public_indoors'
+	gs 'family_schedule'
 	gs 'themes', 'indoors'
+	gs 'stat'
 	'<center><b><font color="maroon">Beauty Bar</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/salon.jpg"></center>'
-	
+
+	if locat['Mother'] = 21 and locat['Mom_Salon_daystart'] ! daystart: gt 'salon', 'mom'
+
 	if masseuse['jobtype'] ! 0:
 		masseuse['warning'] = 3 - masseuse['missed shifts']
 		if masseuse['warning'] = 0:gt'salon','fired'
@@ -2279,7 +2282,7 @@ if $ARGS[0] = 'mom':
 			*clr & cla
 			npc_rel['A29'] += 1
 			npc_rel['A30'] += 1
-			momloc[11] = daystart
+			locat['Mom_Salon_daystart'] = daystart
 			minut += 20
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/momsvetsalon.jpg"></center>'

locations/saveupdater.qsrc

@@ -1165,6 +1165,27 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 			christinaQW['bully'] = 60
 		end
 	end
+
+	!!Schedule migrated to the array, no need to change first
+	killvar 'chrisloc'
+	killvar 'lariloc'
+	killvar 'momloc'
+	killvar 'sdadloc'
+	killvar 'anyaloc'
+	killvar 'kolloc'
+	if momclean1 > 0:
+		locat['Mother_clean1'] = momclean1
+	end
+	if momclean2 > 0:
+		locat['Mother_clean2'] = momclean2
+	end
+	killvar 'momclean1'
+	killvar 'momclean2'
+	!!if indorf > 0:
+	!!	locat['Fam_inGad'] = indorf
+	!!end
+	!!killvar 'indorf'
+
 	if workKafe = 1:
 		workKafe = 0
 		workKafe['job'] = 1
@@ -1197,11 +1218,6 @@ if stat['virgin'] > 0:
 	killvar 'stat', 'virgin'
 end
 
-if chrisloc > 0:
-	locat['Christina'] = chrisloc
-	killvar 'chrisloc'
-end
-
 gs 'saveg'
 --- saveupdater ---------------------------------
 

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 anyaloc['inroom'] = 1:sis_watch = 2 & 'Anya smiles and lets you carry on.'
+		if locat['Anya_inroom'] = 1:sis_watch = 2 & 'Anya smiles and lets you carry on.'
 	end
 
 	!!then the calculation invasion
@@ -656,9 +656,9 @@ if $ARGS[0] = 'sis_prov':
 		gs 'family'
 
 		if sister_indorf = 0:
-			if anyaloc['inroom'] = 0 and proverkasisterhere = 0:proverkasisterhere = 1
+			if locat['Anya_inroom'] = 0 and proverkasisterhere = 0:proverkasisterhere = 1
 
-			if anyaloc['inroom'] = 1:
+			if locat['Anya_inroom'] = 1:
 				cls
 				if sisboytrio > 0 and sis_watch = 1:
 					sis_watch = 2

locations/shop.qsrc

@@ -47,7 +47,7 @@ if $shoplocation = 'main':
 	
 	!! The store in the town and in the altstart only
 	if $loc = 'pav_commercial':
-		if anyaloc = 7:
+		if locat['Anya'] = 7:
 			*nl
 			'Your sister <a href="exec:$shoplocation = ''Anya'' & gt ''shop'', ''move''">Anya</a> is sitting at the cash register.'
 		end

locations/sisterQW.qsrc

@@ -306,9 +306,9 @@ if $ARGS[0] = 'sisboytrioQW_bedroom':
 !!I don''t understand how the two options are decided so I am just leaving the code as is, I know it has to do with if you are to late to join, but not sure how it works I will just rewriting and expanding the sex part, while leaving you to figure out the code 
 	CLOSE ALL
 	blockBedrPar = 1
-	anyaloc = 15
-	anyaloc['rand1'] = daystart
-	anyaloc['save1'] = anyaloc
+	locat['Anya'] = 15
+	locat['Anya_rand1'] = daystart
+	locat['Anya_save1'] = locat['Anya']
 	*clr & cla
 	if hour = 17:
 		minut += 1

locations/sister_chat.qsrc

@@ -180,7 +180,7 @@ if $ARGS[0] = 'sister_chat':
 
 	!Anya will only invite Sveta from Tuesday to Thursday, daystart part blocks her from asking again
 	!! This needs a few extra triggers as Anya shouldn''t be trying to outright corrupt Sveta
-	if anyaloc ! 1:
+	if locat['Anya'] ! 1:
 		!! If you are visibly pregnant:
 		if npc_pregtalk['A33'] = 0 and func('body_din','pregnancyVisibility') = 1 and $loc = 'bedrPar':
 			npc_pregtalk['A33'] = 1
@@ -461,14 +461,14 @@ if $ARGS[0] = 'sister_chat':
 			act 'Move away': gt $loc, $loc_arg
 			exit
 		!! Anya is about to head to work
-		elseif anyaloc = 4 and $loc = 'bedrPar':
+		elseif locat['Anya'] = 4 and $loc = 'bedrPar':
 			*clr & cla
 			'<center><h1><font color="maroon">Anya</font></h1></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sobir.jpg"></center>'
 			'Your sister is busy getting ready for work.'
 			'Anya, without even turning around, says, "Sorry <<$pcs_nickname>>, no time to talk. I''m already late!"'
 			act 'Move away': gt $loc, $loc_arg
-		elseif anyaloc = 2 and $loc ! 'bedrPar':
+		elseif locat['Anya'] = 2 and $loc ! 'bedrPar':
 			*clr & cla
 			'<center><h1><font color="maroon">Anya</font></h1></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat_kitchen1.jpg"></center>'

locations/sitrPar.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = '':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Living Room</font></b></center>'
-	if momloc = 19 and sdadloc = 10:
+	if locat['Mother'] = 19 and locat['Stepdad'] = 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladtv.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
@@ -71,7 +71,7 @@ if $ARGS[0] = '':
 		act 'Get up from the table':gt $loc, $loc_arg
 
 		end
-	elseif momloc = 24:
+	elseif locat['Mother'] = 24:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka1.jpg"></center>'
 		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 			if CloStyle2 = 4:
@@ -87,7 +87,7 @@ if $ARGS[0] = '':
 			act 'leave': gt 'korrPar'
 		end
 		exit
-	elseif momloc = 19 and sdadloc = 10:
+	elseif locat['Mother'] = 19 and locat['Stepdad'] = 10:
 		!! Watches TV with Vladimir
 		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladtv.jpg"></center>'
 		'As you walk into the living room, you see your <<$npc_nickname[''A29'']>> and Vladimir sitting on the couch watching TV.'
@@ -108,7 +108,7 @@ if $ARGS[0] = '':
 			act 'Keep watching':gt 'sitrPar', 'TVfam'
 			act 'Finish watching':gt 'sitrPar', 'TVend'
 		end
-	elseif momloc = 19:
+	elseif locat['Mother'] = 19:
 		!!Mom by herself watching TV
 		ocpd_room = 1
 		'As you walk into the living room, you see your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> sitting on the couch watching TV.'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'TVfam':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
 	'You continue to watch TV with the family. Everyone seems very engrossed in the program and almost never says anything, though Kolka occasionally makes a crack about what is happening, often getting shushed by Vlad or <<$npc_nickname[''A29'']>>.'
-	if momloc = 19: act'Keep watching TV with your family': gt 'sitrPar', 'TVfam'
+	if locat['Mother'] = 19: act'Keep watching TV with your family': gt 'sitrPar', 'TVfam'
 	act 'Finish watching':gt 'sitrPar', 'TVend'
 end
 

locations/vanrPar.qsrc

@@ -58,7 +58,7 @@ end
 if $ARGS[0] = 'peek':
 	menu_off = 1
 
-	if sdadloc['athome'] = 1 and momloc['athome'] = 0 and indorf = 0 and stepdadqw_day ! daystart and iif(stepdadqw>0,1,rand(0,1)) = 1:
+	if locat['sdad_athome'] = 1 and locat['Mom_athome'] = 0 and indorf = 0 and stepdadqw_day ! daystart and iif(stepdadqw>0,1,rand(0,1)) = 1:
 		*clr & cla
 		stepdadqw_day = daystart
 		if npc_rel['A28'] < 60 or stepdadqw < 3:
@@ -67,7 +67,7 @@ if $ARGS[0] = 'peek':
 			stepdadqw += 1
 			act 'Finish': gt 'vanrPar'
 		else
-			if npc_sex['A28'] = 0 or stepdadqw < 5 or mesec > 0 or momloc['athome'] = 1:
+			if npc_sex['A28'] = 0 or stepdadqw < 5 or mesec > 0 or locat['Mom_athome'] = 1:
 				gs 'vanrPar', 'stepdad_nosex'
 			else
 				*clr & cla
@@ -77,7 +77,7 @@ if $ARGS[0] = 'peek':
 				act 'Go away': gs 'vanrPar', 'stepdad_sex_no'
 			end
 		end
-	elseif kolloc['athome'] = 1 and brother_ev1 ! daystart and rand(0,4) < 2 and indorf = 0:
+	elseif locat['Kolka_athome'] = 1 and brother_ev1 ! daystart and rand(0,4) < 2 and indorf = 0:
 		*clr & cla
 		brother_ev1 = daystart
 		'Despite the pattering sound of the water, you hear the bathroom door creaking open slightly. Through the crack in the door, you notice your brother Kolka watching you.'