Variable to tell where Sveta is, change home id from number to name

locations/BDsex.qsrc

@@ -509,7 +509,7 @@ if $ARGS[0] = 'end':
 		InYouHome = 0
 		'<<$boydesc>> politely says goodbye and leaves.'
 
-		act 'Leave':gt $home_entrance, 'start'
+		act 'Leave':gt $home['entrance'], 'start'
 
 		exit
 	elseif GoToGuy = 1:

locations/Cheatmenu_din.qsrc

@@ -2713,9 +2713,9 @@ $cheatmenu['vartracker'] = {
 	'$locM: <<$locM>>'
 	'<font color = red>$CURLOC: <<$CURLOC>></font>'
 	'$location_type: <<$location_type>>'
-	'curr_home: <<curr_home>>'
-	'$home_town: <<$home_town>>'
-	'$home_name: <<$home_name>>'
+	'home['current']: home['current']'
+	'$home['town']: <<$home[''town'']>>'
+	'$home['name']: <<$home[''name'']>>'
 	'daystart: <<daystart>>'
 	'daystart_start: <<daystart_start>>'
 	'month: <<month>>'

locations/HotelRoom.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'normal':
 	end
 	if money >= 100: act'Order room service (0:30) (100 <b>₽</b>)':gs 'food', 'h_food'
 	act 'Drink some water (0:01)': gs 'beverage', 'bev_wat'
-	if $hotel = 'pav_hotel' and curr_home = 6 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $hotel = 'pav_hotel' and home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin
@@ -71,7 +71,7 @@ if $ARGS[0] = 'better':
 	if money >= 100: act'Order room service (0:30) (100 <b>₽</b>)':gs 'food', 'h_food'
 	act 'Drink some water (0:05)': gs 'beverage', 'bev_wat'
 	act 'Have a coffee (0:05)': gs 'beverage', 'bev_cof'
-	if $hotel = 'pav_hotel' and curr_home = 6 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $hotel = 'pav_hotel' and home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin
@@ -110,7 +110,7 @@ if $ARGS[0] = 'best':
 	act 'Drink some water (0:01)': gs 'beverage', 'bev_wat'
 	act 'Have a coffee (0:05)': gs 'beverage', 'bev_cof'
 	act 'Make some tea (0:05)': gs 'beverage', 'bev_tea'
-	if $hotel = 'pav_hotel' and curr_home = 6 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $hotel = 'pav_hotel' and home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

locations/Komp.qsrc

@@ -242,7 +242,8 @@ if $ARGS[0] = 'znak':
 
 			act 'Leave this website':gt 'komp', 'brows'
 		end
-	elseif curr_home ! 1 and curr_home ! 2 and curr_home ! 3 and curr_home ! 4 and curr_home ! 5:
+	!! Eligible homes: 1, 2, 3, 4, 5, 7 , 10, 11, 15
+	elseif $home['type'] ! 'permanent_residence':
 		pcs_mood += rand(5, 10)
 		'You spend time looking at the various profiles, but it won''t let you register unless you have your own home and it is set as your current home.'
 		'Still, some of the pictures were quite raunchy and the more desperate profiles were really funny.'

locations/agentned.qsrc

@@ -313,10 +313,10 @@ if $ARGS[0] = 'rent_cityres':
 			end
 			home_owned[1] = 1
 			if ARRSIZE('home_owned') = 0:
-				gs 'set_home', 1
+				gs 'set_home', home[$home_name]
 			else
 				$set_homeyn = input("Would you like to set this as your new home? (yes/no)")
-				if $set_homeyn = 'yes': gs 'set_home', 1
+				if $set_homeyn = 'yes': gs 'set_home', home[$home_name]
 				killvar '$set_homeyn'
 			end
 			ArendHouseSL += ArendHouseSL_due
@@ -367,10 +367,10 @@ if $ARGS[0] = 'rent_pushkin':
 			end
 			home_owned[4] = 1
 			if ARRSIZE('home_owned') = 0:
-				gs 'set_home', 4
+				gs 'set_home', home[$home_name]
 			else
 				$set_homeyn = input("Would you like to set this as your new home? (yes/no)")
-				if $set_homeyn = 'yes': gs 'set_home', 4
+				if $set_homeyn = 'yes': gs 'set_home', home[$home_name]
 				killvar '$set_homeyn'
 			end
 			ArendHouseSL4 += ArendHouseSL_due
@@ -409,10 +409,10 @@ if $ARGS[0] = 'buy_cityres':
 	karta -= home_value[1]
 	home_owned[1] = 2
 	if ARRSIZE('home_owned') = 0:
-		gs 'set_home', 1
+		gs 'set_home', home[$home_name]
 	else
 		$set_homeyn = input("Would you like to set this as your new home? (yes/no)")
-		if $set_homeyn = 'yes': gs 'set_home', 1
+		if $set_homeyn = 'yes': gs 'set_home', home[$home_name]
 		killvar '$set_homeyn'
 	end
 	gs'stat'
@@ -432,10 +432,10 @@ if $ARGS[0] = 'buy_dacha':
 	karta -= home_value[3]
 	home_owned[3] = 1
 	if ARRSIZE('home_owned') = 0:
-		gs 'set_home', 3
+		gs 'set_home', home[$home_name]
 	else
 		$set_homeyn = input("Would you like to set this as your new home? (yes/no)")
-		if $set_homeyn = 'yes': gs 'set_home', 3
+		if $set_homeyn = 'yes': gs 'set_home', home[$home_name]
 		killvar '$set_homeyn'
 	end
 	etoexhib = 0
@@ -456,10 +456,10 @@ if $ARGS[0] = 'buy_Mansion':
 	karta -= home_value[5]
 	home_owned[5] = 1
 	if ARRSIZE('home_owned') = 0:
-		gs 'set_home', 5
+		gs 'set_home', home[$home_name]
 	else
 		$set_homeyn = input("Would you like to set this as your new home? (yes/no)")
-		if $set_homeyn = 'yes': gs 'set_home', 5
+		if $set_homeyn = 'yes': gs 'set_home', home[$home_name]
 		killvar '$set_homeyn'
 	end
 	gs'stat'
@@ -479,10 +479,10 @@ if $ARGS[0] = 'buy_city_house_res':
 	karta -= home_value[15]
 	home_owned[15] = 1
 	if ARRSIZE('home_owned') = 0:
-		gs 'set_home', 15
+		gs 'set_home', home[$home_name]
 	else
 		$set_homeyn = input("Would you like to set this as your new home? (yes/no)")
-		if $set_homeyn = 'yes': gs 'set_home', 15
+		if $set_homeyn = 'yes': gs 'set_home', home[$home_name]
 		killvar '$set_homeyn'
 	end
 	gs'stat'

locations/bedr.qsrc

@@ -6,6 +6,7 @@ $loc = 'bedr'
 $loc_arg = ''
 $locM = 'bedr'
 $locM_arg = ''
+$home_name = 'city_apartment'
 $menu_loc = 'bedr'
 $menu_arg = ''
 menu_off = 0
@@ -228,7 +229,7 @@ gs 'subkid'
 
 act 'Relax on your bed': gt 'bed', 'start'
 
-if curr_home = 1 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
 --- bedr ---------------------------------
 

locations/bedr2x.qsrc

@@ -211,7 +211,7 @@ end
 gs 'subkid'
 
 act 'Relax on your bed': gt 'bed', 'start'
-if curr_home = 4 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
 --- bedr2x ---------------------------------
 

locations/bedrPar.qsrc

@@ -185,7 +185,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		act 'Open wardrobe': gt 'wardrobe', 'start'
 		
-		if curr_home = 2 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+		if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 		
 		if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
 		!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.

locations/beg1.qsrc

@@ -385,7 +385,7 @@ end
 
 if $ARGS[0] = 'Family extension':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/St_Petersburg_run_win.jpg"></center>'
-	if curr_home = 2:
+	if home['current'] = home['parents_home']:
 		if npc_rel['A34'] > 50:
 			minut += 10
 			gs 'stat'

locations/begin.qsrc

@@ -10,6 +10,7 @@ if $ARGS[0] = 'start':
 	settingmode = 0
 
 	gs 'Cheatmenu_din'
+	gs 'set_home', 'init_homeids'
 	showstat 1
 	'<center><b><font color="maroon">CHOOSE GAME START</font></b></center>'
 	*nl

locations/city_house_res_bedr.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'bedro':
 	if pornMagazine > 0:'You have hidden your porn magazine in your nightstand.'
 	*nl
 	'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
-	if curr_home = 15 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
+	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
 end
 
 --- city_house_res_bedr ---------------------------------

locations/city_house_res_misc.qsrc

@@ -5,6 +5,7 @@
 if $ARGS[0] = 'fronty':
 	$loc = 'city_house_res_misc'
 	$loc_arg = 'fronty'
+	$home_name = city_house
 	$menu_loc = 'city_house_res_misc'
 	$menu_arg = 'fronty'
 	$location_type = 'public_outdoors'
@@ -36,8 +37,8 @@ if $ARGS[0] = 'fronty':
 		minut += 10
 		gt 'city_residential'
 	end
-	if curr_home ! 15:
-		act 'Set this house as your main home':gs 'set_home', 15 & gt 'city_house_res_misc', 'fronty'
+	if home['current'] ! home[$home_name]:
+		act 'Set this house as your main home':gs 'set_home', home[$home_name] & gt 'city_house_res_misc', 'fronty'
 	end
 
 end

locations/city_lake.qsrc

@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'stasValera4':
 						act 'Leave':gt 'city_lake', 'start'
 					end
 
-					if curr_home = 1:
+					if home['current'] = home['city_apartment']:
 						act 'Agree':
 							cla & *clr
 							minut += 5

locations/city_mansion_entrance.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = '':
 	$loc_arg = ''
 	$loc = 'city_mansion_entrance'
+	$home_name = 'matryona_mansion'
 	$menu_loc = 'city_mansion_entrance'
 	$menu_arg = ''
 	menu_off = 0
@@ -29,7 +30,7 @@ if $ARGS[0] = '':
 		'<a href="exec:gs ''carF'', ''start''">Your <<$car>></a> is parked here.'
 	end
 
-	if curr_home = 5:
+	if home['current'] = home[$home_name]:
 		if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your mansion, and standing beside it, you notice Vladimir</a>.'
 		if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your mansion, and standing beside it, you notice Vladimir</a>.'
 
@@ -44,7 +45,11 @@ if $ARGS[0] = '':
 		end
 	end
 
-	act 'Go to the suburbs':minut += 10 & gt 'city_suburbs', 'start'
+	act 'Go to the suburbs':
+		minut += 10 
+		gt 'city_suburbs', 'start'
+	end
+
 	if home_owned[5] = 3: act 'Walk inside the mansion': minut += 4 & gt 'city_mansion_residence_1', 'yfoyer'
 
 	if karta + bankDebtLimit >= 1500000 and home_owned[5] = 0:

locations/city_mansion_residence_1.qsrc

@@ -55,8 +55,8 @@ if $ARGS[0] = 'yfoyer':
 	end
 	if bassMansion = 1:act 'Go to your pool': minut += 1 & gt 'city_mansion_residence_3', 'ypool'
 	if banaMansion >= 1:act 'Go to your sauna': minut += 1 & gt 'city_mansion_residence_3', 'ysauna'
-	if curr_home ! 5:
-		act 'Set this apartment as your main home':gs 'set_home', 5 & gt 'city_mansion_residence_1', 'yfoyer'
+	if home['current'] ! home[$home_name]:
+		act 'Set this apartment as your main home':gs 'set_home', home[$home_name] & gt 'city_mansion_residence_1', 'yfoyer'
 	else
 		if $status['dog'] ! 'blocked' and menu_off = 0 and rex['owned'] = 1:
 			if rex['status'] = 0:
@@ -97,7 +97,7 @@ if $ARGS[0] = 'ybedroom':
 	
 	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
 	act 'Relax on your bed': gt 'bed', 'start'
-	if curr_home = 5 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
 	if pornMagazine > 0:gs 'events', 'read_porn'
 

locations/dachain.qsrc

@@ -51,7 +51,7 @@ if $args[0] = 'start':
 	act 'Go to the kitchen alcove': gt 'dachain', 'dachakit'
 	act 'Get in the bed': gt 'bed', 'start'
 	act 'Lie on the couch': gt 'divan', 'start'
-	if curr_home = 3 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
 !!-------------------------------------------------------------------------------------------------------------------------------------
 !!------------------------------------------------------- Music related actions come here ---------------------------------------------

locations/dachamy.qsrc

@@ -3,10 +3,10 @@
 *clr & cla
 $loc_arg = ''
 $loc = 'dachamy'
+$home_name = 'village_cottage'
 $menu_loc = 'dachamy'
 $menu_arg = ''
 menu_off = 0
-
 $location_type = 'public_outdoors'
 
 gs 'stat'
@@ -15,7 +15,9 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/suburban/cottage/dachamy.jpg"></center>'
 'Your favorite summer residence.'
 
-act 'Exit the alley':minut += 15 & gt 'dachi'
+act 'Exit the alley':
+	minut += 15
+	gt 'dachi'
 
 act 'Go into the house':gt 'dachain', 'start'
 

locations/dachi.qsrc

@@ -34,7 +34,7 @@ if home_owned[3] > 0:
 	end
 end
 
-if curr_home = 3:
+if home['current'] = home['village_cottage']:
 	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your cottage, and standing beside it, you notice Vladimir</a>.'
 	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your cottage, and standing beside it, you notice Vladimir</a>.'
 

locations/din_npc.qsrc

@@ -6,22 +6,22 @@
 ! 3 = St. Petersburg Apt
 
 if $ARGS[0] = 'go_home':
-	if curr_home = 12:
+	if home['current'] = home['hunters_lodge']:
 		gt 'swamp_yard','start'		
-	elseif $home_location = 'pav_complex':
+	elseif $home['location'] = 'pav_complex':
 		gt 'pav_complex', 'start'
 	else
-		gt $home_location				
+		gt $home['location']				
 	end
 end
 
 if $ARGS[0] = 'go_straight_home':
-	if curr_home = 10:
+	if home['current'] = home['lyceum_dorm']:
 		gt 'etoexhib', 'pos40'
-	elseif curr_home = 11:
+	elseif home['current'] = home['university_dorm']:
 		gt 'uni_dorm', 'dorm_room'
 	else
-		gt $home_entrance, 'start'
+		gt $home['entrance'], 'start'
 	end
 end
 

locations/dom_gor.qsrc

@@ -6,6 +6,7 @@ $locM_arg = $ARGS[0]
 $locM = 'dom_gor'
 $loc_arg = $ARGS[0]
 $loc = 'dom_gor'
+$home_name = 'lyceum_dorm'
 $location_type = 'private'
 clr
 gs 'stat'
@@ -185,10 +186,10 @@ act 'Go out onto the street':
 
 end
 
-if curr_home = 10 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
-if curr_home ! 10:
-	act 'Set the this small room as your main home':gs 'set_home', 10 & gt 'dom_gor'
+if home['current'] ! home[$home_name]:
+	act 'Set the this small room as your main home':gs 'set_home', home[$home_name] & gt 'dom_gor'
 end
 
 --- dom_gor ---------------------------------

locations/gaddvor.qsrc

@@ -5,6 +5,7 @@ if $ARGS[0]='':
 	$loc_arg = ''
 	$loc = 'gaddvor'
 	$location_type = 'public_outdoors'
+	$home_name = 'grandparents_house'
 	$menu_loc = 'gaddvor'
 	$menu_arg = ''
 	menu_off = 0
@@ -38,7 +39,7 @@ if $ARGS[0]='':
 		act 'Enter the banya':minut += 1 & gt 'gadbana'
 	else
 		if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are several <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
-		if curr_home = 14 and hour > 7 and hour < 20 and rex['owned'] = 1:
+		if home['current'] = home[$home_name] and hour > 7 and hour < 20 and rex['owned'] = 1:
 			if $status['dog'] = '':
 				gt 'pet_dog', 'name'
 			else
@@ -55,7 +56,7 @@ if $ARGS[0]='':
 	if MiraLoc ! 7: mira_guest = 0
 
 	act '<b>Leave and go into the village</b>':
-		if $clothingworntype ! 'nude':
+		if $clothingworntype ! 'nude':	
 			minut += 5
 			gt 'gadukino'
 		else

locations/gadhouse.qsrc

@@ -93,7 +93,8 @@ if $ARGS[0] = 'start':
 	$menu_arg = ''
 	menu_off = 1
 	$locclass = 'singleroom'
-
+	$home_name = 'grandparents_house'
+	
 	display_bb = 1
 	frost = 0
 	home_owned[14] = 1
@@ -501,7 +502,7 @@ if $ARGS[0] = 'main':
 
 	if rand(0,2) ! 0: gs 'din_bad' & dynamic $mobile_check
 	act 'Relax on your bed': gt 'bed', 'start'
-	if curr_home = 14 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
+	if home['current'] = home['grandparents_house'] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
 end
 
 if $ARGS[0] = 'grandma':
@@ -1642,7 +1643,7 @@ if $ARGS[0] = 'to_pavlovsk':
 
 	'You get into the Volga with the rest of your family and before you know it, you''ve arrived back in Pavlovsk.'
 
-	act 'Go to your room': gt 'bedrPar'
+	act 'Go home': gt 'korrPar'
 end
 
 if $ARGS[0] = 'to_gadukino':
@@ -1744,7 +1745,7 @@ if $ARGS[0] = 'intro':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 						*nl
 						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms off towards your grandparent''s outside door. "Don''t forget to talk to your grandparent''s and ask if they need help!" she says loudly. Without waiting for your response, she closes the door, and with that, she''s gone.'
-
+						!! TODO: Check how it gets back to the house and if $home_name is set properly at that point.
 						act 'I understand...':gt 'budilnik', 'start'
 					end
 				end

locations/gadukino.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = '':
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
 		'Several small farms are scattered around the outskirts of the village, one of which belongs to <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a>.'
 		act 'Go to your grandparent''s house': minut += 5 & gt 'gaddvor'
-		if curr_home = 12 or curr_home = 14:
+		if home['current'] = home['hunters_lodge'] or home['current'] = home['grandparents_house']:
 			if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
 			if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
 

locations/gschool_grounds.qsrc

@@ -783,7 +783,7 @@ end
 
 if $ARGS[0] = 'Family extension':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/school_run.jpg"></center>'
-	if curr_home = 2:
+	if home['current'] = home['parents_home']:
 		if npc_rel['A34'] > 50:
 			'You hear your name and turn to see Kolka. "<<$pcs_nickname>>... <<$pcs_nickname>> you won!" Kolka shouts while running towards you with a huge grin. He crashes into you and gives you a tight hug.'
 			'"Hey, how''s my favourite brother? Thanks for coming, I wasn''t aware you knew I was running."'

locations/home_activity.qsrc

@@ -6,7 +6,7 @@
 
 if $ARGS[0] = 'vomiting_check':
 	!! if not one of these locations, event will not fire
-	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or curr_home = 5 or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
+	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or home['current'] = 5 or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
 		gs 'home_activity', 'vomiting_images'
 		gt 'home_activity', 'morning_vomit'
 !!	else
@@ -50,7 +50,7 @@ if $ARGS[0] = 'vomiting_images':
 		$home_activity['vomit_bedroom'] = '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
 		$home_activity['vomit_bathroom'] = '<center><img <<$set_imgh>> src="images/locations/pushkin/apartment/vanr2x.jpg"></center>'
 		$home_activity['vomit_exit'] = 'vanr2x'
-	elseif curr_home = 5:
+	elseif home['current'] = 5:
 		!! location = 'Matryona mansion'
 		
 		if ymanrem[4] = 2:
@@ -312,7 +312,7 @@ if $ARGS[0] = 'vomiting_exit':
 	elseif at_home = 4:
 		!! location = 'Old town apartment'
 		gt 'vanr2x'
-	elseif curr_home = 5:
+	elseif home['current'] = 5:
 		!! location = 'Matryona mansion'
 		gt'city_mansion_residence_1','ybathroom'
 	elseif at_home = 6:

locations/intro_city_select.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 	pcs_sleep = 100
 	willpowermax = 100
 
-	if mid($start_type,1,4) = 'city': gs 'set_home', 1
+	if mid($start_type,1,4) = 'city': gs 'set_home', home['city_apartment']
 
 	ml_update_1 = 1
 	birthyear = 1999

locations/intro_sg_select.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'start':
 	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
 
 	home_owned[2] = 1
-	gs 'set_home', 2
+	gs 'set_home', home['parents_home']
 
 	killvar 'class_list_institution'
 	killvar 'class_list_name'

locations/intro_sg_tg.qsrc

@@ -180,7 +180,7 @@ if $ARGS[0] = 'settings':
 	npc_rel['A25'] -= 5
 
 	home_owned[2] = 1
-	gs 'set_home', 2
+	gs 'set_home', home['parents_home']
 
 	pcs_eyesize = 3
 	pcs_lip = 2

locations/intro_uni.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = 'degree_choice':
 	university['student'] = 1
 	university['enrolled_in_semester'] = 1
 	home_owned[11] = 1
-	gs 'set_home', 11
+	gs 'set_home', home['university_dorm']
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/system/1_openings/6_uni/degree_choice.jpg"></center>'
 	'This is where you decide what degree you wish to study. For now, Teaching is the only option, but more will be added in the future.'

locations/kafesvid.qsrc

@@ -498,7 +498,7 @@ if $ARGS[0] = '3':
 
 	if $telsob = $loverdesc[lover_number]:
 		'After your fun, <<$telsob>> looks at you and waits for your next move.'
-		if $home_town = 'pavlovsk':
+		if $home['town'] = 'pavlovsk':
 			act 'Say goodbye': gt 'pav_residential'
 		else
 			act 'Say goodby': gt 'city_center'
@@ -506,7 +506,7 @@ if $ARGS[0] = '3':
 		act 'Invite her to your home': gt 'lezbsex', 'startloverhome'
 	else
 		'After your fun, <<$telsob>> says she has to go. She leaves you with a little kiss on the cheek.'
-		if $home_town = 'pavlovsk':
+		if $home['town'] = 'pavlovsk':
 			act 'Leave': gt 'pav_residential'
 		else
 			act 'Leave': gt 'city_center'

locations/kinosvid.qsrc

@@ -463,7 +463,7 @@ if $ARGS[0] = '3':
 
 	if $telsob = $loverdesc[lover_number]:
 		'When the movie ends, <<$telsob>> looks at you and waits for your next move.'
-		if $home_town = 'pavlovsk':
+		if $home['town'] = 'pavlovsk':
 			act 'Kiss her and say goodbye': gt 'gskino'
 		else
 			act 'Kiss her and say goodbye': gt 'torgcentr'
@@ -471,7 +471,7 @@ if $ARGS[0] = '3':
 		act 'Kiss her and invite her to your home': gt 'lezbsex', 'startloverhome'
 	else
 		'When the movie ends, <<$telsob>> says she has get home. She leaves you with a deep kiss, leaving you wanting more.'
-		if $home_town = 'pavlovsk':
+		if $home['town'] = 'pavlovsk':
 			act 'Leave': gt 'gskino'
 		else
 			act 'Leave': gt 'torgcentr'

locations/korr.qsrc

@@ -9,8 +9,10 @@ $locM_arg = ''
 $menu_loc = 'korr'
 $menu_arg = ''
 menu_off = 0
+$home_name = 'city_apartment'
 $location_type = 'private'
 killvar '$locclass'
+
 if sound = 0:PLAY 'sound/korr.mp3',30
 
 if courtletter_date <= daystart and courtletter_date ! 0: gt 'sentence', 'letter'
@@ -54,8 +56,8 @@ act 'Go to the bedroom':gt 'bedr'
 act 'Go to the bathroom':gt 'vanr'
 act 'Go to the kitchen':gt 'kuhr'
 act 'Go to the living room':gt 'sitr'
-if curr_home ! 1:
-	act 'Set this apartment as your main home':gs 'set_home', 1 & gt 'korr'
+if home['current'] ! home[$home_name]:
+	act 'Set this apartment as your main home':gs 'set_home', home[$home_name] & gt 'korr'
 else
 	if $status['dog'] ! 'blocked' and menu_off = 0 and rex['owned'] = 1:
 		if rex['status'] = 0:
@@ -150,7 +152,6 @@ if BurgerQW['IlyQW']  = 3 and hour >= 9 and hour <= 20:
 		age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
 		money = 2000
 		'The police arrive and take you to court. After standing trial, you are given five years of jail time and are required to pay your debt of <<DolgRS>>.'
-
 		act 'Serve your time':
 			*clr & cla
 			srok_kolvo = 1
@@ -174,10 +175,10 @@ if BurgerQW['IlyQW']  = 3 and hour >= 9 and hour <= 20:
 			SLomka = 0
 			work = 0
 			workKafe['job'] = 0
-			workhosp =0
-			worksalon =0
-			tanwork =0
-			workSec =0
+			workhosp = 0
+			worksalon = 0
+			tanwork = 0
+			workSec = 0
 			preg = 0
 			young_shop_work = 0
 			gs 'uniutil', 'student', 'unenroll'
@@ -199,38 +200,32 @@ if BurgerQW['IlyQWDay'] ! daystart and BurgerQW['IlyQW']  = 1 and hour >= 8 and
 		*clr & cla
 		gs 'stat'
 		'You walk up to the door and look through the peephole. You see a few men, and even in the dark, you recognize them from their caps. "<<$pcs_firstname>> <<$pcs_lastname>>! This is the police, open up!"'
-
+		
 		act 'Answer the door':
 			*clr & cla
-			minut += 60
+			minut += 120
 			BurgerQW['IlyQW']  = 2
 			gs 'stat'
 			'You open the door, wondering what they want from you. There are several men in uniform and others in civilian clothes. A lean and skinny man with with a weeks worth of stubble and a pistol in a holster slung under his armpit speaks to you. "Please take a seat while we search the apartment. This is a warrant for your arrest and this is a search warrant for your apartment. You can read them." The men start searching your apartment and a few minutes later, one of them reappears. "Here are the keys. According to the description, these look like the keys to the office and the safe where the money was stolen." The detective frowns at you and nods to the officer, who pulls your hands behind your back and snaps the handcuffs around your wrists.'
-
-			act 'Go with the police':
+			wait 1500
+			'You''re escorted out of the building in handcuffs and pushed into a police car. After the door slams shut, the car starts up and drives through the city streets until it stops outside the police station and you''re pulled out and brought into an interview room where the dectective is waiting for you. He takes the handcuffs off you and offers you a seat. You sit in a hard and uncomfortable chair while the detective turns the TV on and inserts a video tape. On the screen is footage from a security camera in Bystroeshke showing you appear in the corridor and entering the office before exiting a few minutes later holding a thick envelope. The detective takes the tape out and inserts another one.' 
+			'It shows Chubais'' office. The door opens and you walk in holding some keys. You go to the safe, open it with one of the keys and take the envelope with <<$BurgerQW[''IlySecurityCamDesc'']>> written on it. The detective turns the TV off, picks up a plastic bag with the keys inside and finally speaks. "Tests prove that the keys found in your apartment are those to the office and the safe of Bystroezhki. The tapes from the surveillance cameras clearly show you entering the office and taking 650,000 rubles." He takes out a pen and paper and begins to write. While writing, he looks up to you with gloomy eyes and says "A confession will help you in the court. Since this is a first time offense and provided you return the money, you may be given a suspended sentence if you admit your guilt."'
+			act 'Sign confession':
 				*clr & cla
 				minut += 60
 				gs 'stat'
-				'You''re escorted out of the building in handcuffs and pushed into a police car. After the door slams shut, the car starts up and drives through the city streets until it stops outside the police station and you''re pulled out and brought into an interview room where the dectective is waiting for you. He takes the handcuffs off you and offers you a seat. You sit in a hard and uncomfortable chair while the detective turns the TV on and inserts a video tape. On the screen is footage from a security camera in Bystroeshke showing you appear in the corridor and entering the office before exiting a few minutes later holding a thick envelope. The detective takes the tape out and inserts another one.' 
-				'It shows Chubais'' office. The door opens and you walk in holding some keys. You go to the safe, open it with one of the keys and take the envelope with <<$BurgerQW[''IlySecurityCamDesc'']>> written on it. The detective turns the TV off, picks up a plastic bag with the keys inside and finally speaks. "Tests prove that the keys found in your apartment are those to the office and the safe of Bystroezhki. The tapes from the surveillance cameras clearly show you entering the office and taking 650,000 rubles." He takes out a pen and paper and begins to write. While writing, he looks up to you with gloomy eyes and says "A confession will help you in the court. Since this is a first time offense and provided you return the money, you may be given a suspended sentence if you admit your guilt."'
+				'You sign the confession and the detective signals for an officer, who enters the room as the detective nods in your direction. "Take her."'
 
-				act 'Sign confession':
-					*clr & cla
-					minut += 60
-					gs 'stat'
-					'You sign the confession and the detective signals for an officer, who enters the room as the detective nods in your direction. "Take her."'
-
-					act 'Go with him':gt 'kameraKPZ'
-				end
+				act 'Go with him':gt 'kameraKPZ'
+			end
 
-				act 'Tell the truth':
-					*clr & cla
-					minut += 60
-					gs 'stat'
-					'You tell the detective what actually happened and how Ilyushkin framed you, but he barely listens to you before he slams his fist on the table and yells at you. "I wasn''t born yesterday! If you will not cooperate, you''ll rot in prison!" An officer then enters the room and the detective nods in your direction. "Take her."'
+			act 'Tell the truth':
+				*clr & cla
+				minut += 60
+				gs 'stat'
+				'You tell the detective what actually happened and how Ilyushkin framed you, but he barely listens to you before he slams his fist on the table and yells at you. "I wasn''t born yesterday! If you will not cooperate, you''ll rot in prison!" An officer then enters the room and the detective nods in your direction. "Take her."'
 
-					act 'Go with him':gt 'kameraKPZ'
-				end
+				act 'Go with him':gt 'kameraKPZ'
 			end
 		end
 	end
@@ -238,7 +233,9 @@ if BurgerQW['IlyQWDay'] ! daystart and BurgerQW['IlyQW']  = 1 and hour >= 8 and
 	exit
 end
 
-if gopstop > 30:gt 'police', '1'
+if gopstop > 30:
+	gt 'police', '1'
+end
 
 if sick > 0 and doktorday ! daystart:
 

locations/korr2x.qsrc

@@ -10,6 +10,7 @@ $menu_loc = 'korr2x'
 $menu_arg = ''
 menu_off = 0
 $location_type = 'private'
+$home_name = 'old_town_apartment'
 killvar '$locclass'
 clr
 !!have to give Sveta ownership of plasma tv so she can get cable
@@ -22,7 +23,6 @@ music_on = 0
 minut = minut + 1
 elektro = elektro + 1
 gs'stat'
-
 gs 'themes', 'indoors'
 
 if courtletter_date <= daystart and courtletter_date ! 0:
@@ -92,8 +92,8 @@ if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	end
 end
 
-if curr_home ! 4:
-	act 'Set this apartment as your main home':gs 'set_home', 4 & gt 'korr2x'
+if home['current'] ! home[$home_name]:
+	act 'Set this apartment as your main home':gs 'set_home', home[$home_name] & gt 'korr2x'
 else
 	if $status['dog'] ! 'blocked' and menu_off = 0 and rex['owned'] = 1:
 		if rex['status'] = 0:
@@ -109,7 +109,6 @@ end
 if BurgerQW['IlyQW']  = 3 and hour >= 9 and hour <= 20:
 	cls
 	BurgerQW['IlyQW']  = 4
-
 	if DolgRS <= moneySUM:
 		money = moneySUM-650000
 		karta = 0
@@ -173,36 +172,33 @@ if BurgerQW['IlyQWDay'] ! daystart and BurgerQW['IlyQW']  = 1 and hour >= 8 and
 		'You walk up to the door and look through the peephole. You see a few men, and even in the dark, you recognize them from their caps. "<<$pcs_firstname>> <<$pcs_lastname>>! This is the police, open up!"'
 		act 'Open the door':
 			cls
-			minut += 60
+			minut += 120
 			BurgerQW['IlyQW']  = 2
 			gs'stat'
 			'You open the door, wondering what they want from you. There are several men in uniform and others in civilian clothes. A lean and skinny man with with a weeks worth of stubble and a pistol in a holster slung under his armpit speaks to you. "Please take a seat while we search the apartment. This is a warrant for your arrest and this is a search warrant for your apartment. You can read them." The men start searching your apartment and a few minutes later, one of them reappears. "Here are the keys. According to the description, these look like the keys to the office and the safe where the money was stolen." The detective frowns at you and nods to the officer, who pulls your hands behind your back and snaps the handcuffs around your wrists.'
-			act 'Go with the police':
+			wait 1500
+			'You''re escorted out of the building in handcuffs and pushed into a police car. After the door slams shut, the car starts up and drives through the city streets until it stops outside the police station and you''re pulled out and brought into an interview room where the dectective is waiting for you. He takes the handcuffs off you and offers you a seat. You sit in a hard and uncomfortable chair while the detective turns the TV on and inserts a video tape. On the screen is footage from a security camera in Bystroeshke showing you appear in the corridor and entering the office before exiting a few minutes later holding a thick envelope. The detective takes the tape out and inserts another one.' 
+			'It shows Chubais'' office. The door opens and you walk in holding some keys. You go to the safe, open it with one of the keys and take the envelope with <<$BurgerQW[''IlySecurityCamDesc'']>> written on it. The detective turns the TV off, picks up a plastic bag with the keys inside and finally speaks. "Tests prove that the keys found in your apartment are those to the office and the safe of Bystroezhki. The tapes from the surveillance cameras clearly show you entering the office and taking 650,000 rubles." He takes out a pen and paper and begins to write. While writing, he looks up to you with gloomy eyes and says "A confession will help you in the court. Since this is a first time offense and provided you return the money, you may be given a suspended sentence if you admit your guilt."'
+			act 'Sign the confession':
 				cls
 				minut += 60
 				gs'stat'
-				'You''re escorted out of the building in handcuffs and pushed into a police car. After the door slams shut, the car starts up and drives through the city streets until it stops outside the police station and you''re pulled out and brought into an interview room where the dectective is waiting for you. He takes the handcuffs off you and offers you a seat. You sit in a hard and uncomfortable chair while the detective turns the TV on and inserts a video tape. On the screen is footage from a security camera in Bystroeshke showing you appear in the corridor and entering the office before exiting a few minutes later holding a thick envelope. The detective takes the tape out and inserts another one.' 
-				'It shows Chubais'' office. The door opens and you walk in holding some keys. You go to the safe, open it with one of the keys and take the envelope with <<$BurgerQW[''IlySecurityCamDesc'']>> written on it. The detective turns the TV off, picks up a plastic bag with the keys inside and finally speaks. "Tests prove that the keys found in your apartment are those to the office and the safe of Bystroezhki. The tapes from the surveillance cameras clearly show you entering the office and taking 650,000 rubles." He takes out a pen and paper and begins to write. While writing, he looks up to you with gloomy eyes and says "A confession will help you in the court. Since this is a first time offense and provided you return the money, you may be given a suspended sentence if you admit your guilt."'
-				act 'Sign the confession':
-					cls
-					minut += 60
-					gs'stat'
-					'You sign the confession and the detective signals for an officer, who enters the room as the detective nods in your direction. "Take her."'
-					act 'Go with him':gt'kameraKPZ'
-				end
-				act 'Tell the truth':
-					cls
-					minut += 60
-					gs'stat'
-					'You tell the detective what actually happened and how Ilyushkin framed you, but he barely listens to you before he slams his fist on the table and yells at you. "I wasn''t born yesterday! If you will not cooperate, you''ll rot in prison!" An officer then enters the room and the detective nods in your direction. "Take her."'
-					act 'Go with him':gt'kameraKPZ'
-				end
+				'You sign the confession and the detective signals for an officer, who enters the room as the detective nods in your direction. "Take her."'
+				act 'Go with him':gt'kameraKPZ'
+			end
+			act 'Tell the truth':
+				cls
+				minut += 60
+				gs'stat'
+				'You tell the detective what actually happened and how Ilyushkin framed you, but he barely listens to you before he slams his fist on the table and yells at you. "I wasn''t born yesterday! If you will not cooperate, you''ll rot in prison!" An officer then enters the room and the detective nods in your direction. "Take her."'
+				act 'Go with him':gt'kameraKPZ'
 			end
 		end
 	end
 	exit
 end
-if gopstop > 30:gt'police','1'
+if gopstop > 30: gt'police','1'
+
 if sick > 0 and doktorday ! daystart: act 'Call a doctor':doktorday = daystart & dynamic $polidin
 
 $drPP = {

locations/korrPar.qsrc

@@ -16,6 +16,7 @@ $location_type = 'private'
 $menu_loc = 'korrPar'
 $menu_arg = ''
 menu_off = 0
+$home_name = 'parents_home'
 killvar '$locclass'
 clr
 popolaini = 0
@@ -145,11 +146,11 @@ end
 if NatbelQW['QWstage'] >= 4 and week < 6 and (hour = 6 or hour = 7) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
 	*nl
 	'You could go to Natasha''s apartment and get her to carry your books to school.'
-	act 'Go to Natasha''s apartment':gt 'natbel_cp_1', 'carrybooks'
+	act 'Go to Natasha''s apartment': gt 'natbel_cp_1', 'carrybooks'
 end
 
-if curr_home ! 2:
-	act 'Set this apartment as your main home':gs 'set_home', 2 & gt 'korrPar'
+if home['current'] ! home[$home_name]:
+	act 'Set this apartment as your main home':gs 'set_home', home[$home_name] & gt 'korrPar'
 else
 	if $status['dog'] ! 'blocked' and menu_off = 0 and rex['owned'] = 1:
 		if rex['status'] = 0:
@@ -311,7 +312,7 @@ if hour >= 16 and hour <= 20 and locat['Fam_inGad'] = 0:
 				gs 'grades', 'grade_award', 'school', 'his', -100
 				'You find your mother waiting for you when you enter the hallway. You have never seen her this furious before. "<<$pcs_nickname>>? I just got off the phone with the school. They told me you didn''t show up yet again and expelled you. I''m extremely disappointed with you! I''ve warned you so many times! If you want to keep sleeping under this roof, then you better start pulling your weight around here! Right now, I want you to go out and find a job!" She pushes you out the door and slams it shut in your face.'
 
-				act 'Leave':gt 'pav_residential'
+				act 'Leave': gt 'pav_residential'
 				exit
 			elseif schoolPredupr = 1:
 				schoolPredupr = 2
@@ -372,7 +373,7 @@ if hour >= 16 and hour <= 20 and locat['Fam_inGad'] = 0:
 				gs 'grades', 'grade_award', 'school', 'his', -100
 				'You find your mother waiting for you when you enter the hallway. You have never seen her this furious before. "<<$pcs_nickname>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''ve had it with you! I''ve warned you so many times! Go ahead, live your irresponsible life the way you want. You''re no longer welcome here." She has already packed up all your things and roughly shoves the bag into your hands before she pushes you out the door and slams it shut in your face.'
 
-				act 'Leave':gt 'pav_residential'
+				act 'Leave': gt 'pav_residential'
 				exit
 			elseif schoolPredupr = 1:
 				schoolPredupr = 2

locations/lakecafe.qsrc

@@ -494,7 +494,7 @@ if $ARGS[0] = 'bandits':
 				'You don''t have the full amount on you, but you tell them that you have the rest at home. "Oh really? Very original! We''re coming with you! I''m not letting you out of my sight for even one second until your debt is paid!" one of the men grunts.'
 				'The men follow you to your home, and wait impatiently while you collect the money you owe them. When you produce the full amount, they actually seem a bit surprised.'
 				'"Huh. I guess you weren''t lying after all," one says after counting it twice. "Consider your debt paid, miss. Pleasure doing business."'
-				act 'Close the door behind them': gt $home_entrance, 'start'
+				act 'Close the door behind them': gt $home['entrance'], 'start'
 			else
 				money += stolmoney + karta
 				stolmoney = 0

locations/liames.qsrc

@@ -64,7 +64,7 @@ if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on th
 
 act 'wait':gs 'obj_din', 'wait'
 
-if curr_home = 4:
+if home['current'] = home['old_town_apartment']:
 	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir</a>.'
 	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir</a>.'
 

locations/mey_home.qsrc

@@ -10,6 +10,7 @@ if day <= 25 and mey_vika['mey_vika_qw'] > 40: mey_vika['mey_vika_qw'] = 40
 if $args[0] = 'door':
 	$loc_arg = 'door'
 	$loc = 'mey_home'
+	$home_name = 'meynold_household'
 	$menu_loc = 'mey_home'
 	$menu_arg = 'door'
 	menu_off = 0
@@ -61,6 +62,7 @@ end
 if $ARGS[0] = 'start':
 	$loc_arg = 'start'
 	$loc = 'mey_home'
+	$home_name = 'meynold_household'
 	$menu_loc = 'mey_home'
 	$menu_arg = 'start'
 	menu_off = 0
@@ -128,8 +130,8 @@ if $ARGS[0] = 'start':
 	act 'Vicky''s room': gt 'mey_home', '6'
 	act 'Tamara Meynold''s room': gt 'mey_home', '7'
 	act 'Garden': gt 'mey_home', '8'
-	if curr_home ! 16 and home_owned[16] = 1:
-		act 'Set this household as your main home':gs 'set_home', 16 & gt 'mey_home', 'start'
+	if home['current'] ! home[$home_name] and home_owned[16] = 1:
+		act 'Set this household as your main home':gs 'set_home', home[$home_name] & gt 'mey_home', 'start'
 	end
 
 	!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
@@ -270,7 +272,7 @@ if $ARGS[0] = '3':
 	act 'Relax on your bed': gt 'bed', 'start'
 
 	act 'Wait':gs 'obj_din', 'wait'
-	if curr_home = 16 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
+	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
 	!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 

locations/mother.qsrc

@@ -696,7 +696,7 @@ if $ARGS[0] = '':
 		if hour > 9 and hour < 12:
 			'Your <<$npc_nickname[''A29'']>> is finishing up on some meals before leaving for Gadukino and puts down her work for a second. "<<$pcs_nickname>>, well? Do you want to come with us to Gadukino or would you rather stay home with Anya?"'
 
-			act 'Go to Gadukino':gt 'gadhouse', 'to_gadukino'
+			act 'Go to Gadukino': gt 'gadhouse', 'to_gadukino'
 		end
 	end
 

locations/nichBedroomServant.qsrc

@@ -9,6 +9,7 @@ $nichLoc = 'servant'
 $locM_arg = ''
 $location_type = 'private'
 $locclass = 'bedr'
+$home_name = 'maid_bedroom'
 $menu_loc = 'nichBedroomServant'
 $menu_arg = ''
 menu_off = 0
@@ -146,10 +147,10 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		gs 'nichChore','inspect','servant'
 	
 	end
-	if curr_home = 7 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 	
-	if curr_home ! 7:
-		act 'Set the Nicholas house as your main home':gs 'set_home', 7 & gt 'nichBedroomServant'
+	if home['current'] ! home[$home_name]:
+		act 'Set the Nicholas house as your main home':gs 'set_home', home[$home_name] & gt 'nichBedroomServant'
 	end
 	
 elseif $ARGS[0] = 'evtBodyguardIntim1':

locations/obj_din.qsrc

@@ -230,9 +230,9 @@ if $ARGS[0] = 'description':
 	!!!
 
 	if ARRSIZE('home_owned') = 0:
-		'You have nowhere to live, if this is an error set your current home <a href="exec:gs ''obj_din'', ''curr_home''">here</a>.'
+		'You have nowhere to live, if this is an error set your current home <a href="exec:gs ''obj_din'', ''home['current']''">here</a>.'
 	else
-		'Your current home is <a href="exec:gs ''obj_din'', ''curr_home''"><<$home_name>></a>.'
+		'Your current home is <a href="exec:gs ''obj_din'', ''home['current']''"><<$home[''name'']>></a>.'
 	end
 
 	if succubusflag = 1 and sucpcinfo >= 4:
@@ -334,32 +334,32 @@ if $ARGS[0] = 'description':
 	'</td></tr></table></center>'
 end
 
-if $ARGS[0] = 'curr_home':
+if $ARGS[0] = 'home['current']':
 	*clr & cla
 	!'<center><img src="images/system/icons/description.png"><br></center>'
 	'<center><h1><<$pcs_firstname>>''s Home Location</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr><td>'
 	*nl
-	'Your current home is <<$home_name>>.'
+	'Your current home is <<$home[''name'']>>.'
 	*nl
 	act 'Return to main description': gt 'obj_din', 'description'	
 !!This is correct it just looks wrong
-	if home_owned[1] > 0: 'Set current home as <a href="exec:gs ''set_home'', 1 & gs ''obj_din'', ''curr_home''">City residential apartment</a>'
-	if home_owned[2] = 1: 'Set current home as <a href="exec:gs ''set_home'', 2 & gs ''obj_din'', ''curr_home''">Parent''s home in Pavlovsk</a>'
-	if home_owned[3] > 0: 'Set current home as <a href="exec:gs ''set_home'', 3 & gs ''obj_din'', ''curr_home''">My cottage in the cooperative farm</a>'
-	if home_owned[4] = 1: 'Set current home as <a href="exec:gs ''set_home'', 4 & gs ''obj_din'', ''curr_home''">Old town apartment</a>'
-	if home_owned[5] > 2: 'Set current home as <a href="exec:gs ''set_home'', 5 & gs ''obj_din'', ''curr_home''">Matryona mansion</a>'
-	if home_owned[6] = 1: 'Set current home as <a href="exec:gs ''set_home'', 6 & gs ''obj_din'', ''curr_home''">My hotel room in Pavlovsk</a>'
-	if home_owned[7] = 1: 'Set current home as <a href="exec:gs ''set_home'', 7 & gs ''obj_din'', ''curr_home''">Nicholas'' apartment</a>'
-	if home_owned[8] = 1: 'Set current home as <a href="exec:gs ''set_home'', 8 & gs ''obj_din'', ''curr_home''">Niko''s apartment</a>'
-	if home_owned[9] = 1: 'Set current home as <a href="exec:gs ''set_home'', 9 & gs ''obj_din'', ''curr_home''">Uncle Sergey''s apartment</a>'
-	if home_owned[10] = 1: 'Set current home as <a href="exec:gs ''set_home'', 10 & gs ''obj_din'', ''curr_home''">Lyceum school</a>'
-	if home_owned[11] = 1: 'Set current home as <a href="exec:gs ''set_home'', 11 & gs ''obj_din'', ''curr_home''">University halls</a>'
-	if home_owned[12] = 1: 'Set current home as <a href="exec:gs ''set_home'', 12 & gs ''obj_din'', ''curr_home''">Hunter''s lodge in Gadukino</a>'
-	if home_owned[13] = 1: 'Set current home as <a href="exec:gs ''set_home'', 13 & gs ''obj_din'', ''curr_home''">Shared apartment in Pavlovsk</a>'
-	if home_owned[14] = 1: 'Set current home as <a href="exec:gs ''set_home'', 14 & gs ''obj_din'', ''curr_home''">Grandparent''s house in Gadukino</a>'
-	if home_owned[15] = 1: 'Set current home as <a href="exec:gs ''set_home'', 15 & gs ''obj_din'', ''curr_home''">My house in the City residential district</a>'
-	if home_owned[16] = 1: 'Set current home as <a href="exec:gs ''set_home'', 16 & gs ''obj_din'', ''curr_home''">Meynold Houshold</a>'
+	if home_owned[1] > 0: 'Set current home as <a href="exec:gs ''set_home'', 1 & gs ''obj_din'', ''home['current']''">City residential apartment</a>'
+	if home_owned[2] = 1: 'Set current home as <a href="exec:gs ''set_home'', 2 & gs ''obj_din'', ''home['current']''">Parent''s home in Pavlovsk</a>'
+	if home_owned[3] > 0: 'Set current home as <a href="exec:gs ''set_home'', 3 & gs ''obj_din'', ''home['current']''">My cottage in the cooperative farm</a>'
+	if home_owned[4] = 1: 'Set current home as <a href="exec:gs ''set_home'', 4 & gs ''obj_din'', ''home['current']''">Old town apartment</a>'
+	if home_owned[5] > 2: 'Set current home as <a href="exec:gs ''set_home'', 5 & gs ''obj_din'', ''home['current']''">Matryona mansion</a>'
+	if home_owned[6] = 1: 'Set current home as <a href="exec:gs ''set_home'', 6 & gs ''obj_din'', ''home['current']''">My hotel room in Pavlovsk</a>'
+	if home_owned[7] = 1: 'Set current home as <a href="exec:gs ''set_home'', 7 & gs ''obj_din'', ''home['current']''">Nicholas'' apartment</a>'
+	if home_owned[8] = 1: 'Set current home as <a href="exec:gs ''set_home'', 8 & gs ''obj_din'', ''home['current']''">Niko''s apartment</a>'
+	if home_owned[9] = 1: 'Set current home as <a href="exec:gs ''set_home'', 9 & gs ''obj_din'', ''home['current']''">Uncle Sergey''s apartment</a>'
+	if home_owned[10] = 1: 'Set current home as <a href="exec:gs ''set_home'', 10 & gs ''obj_din'', ''home['current']''">Lyceum school</a>'
+	if home_owned[11] = 1: 'Set current home as <a href="exec:gs ''set_home'', 11 & gs ''obj_din'', ''home['current']''">University halls</a>'
+	if home_owned[12] = 1: 'Set current home as <a href="exec:gs ''set_home'', 12 & gs ''obj_din'', ''home['current']''">Hunter''s lodge in Gadukino</a>'
+	if home_owned[13] = 1: 'Set current home as <a href="exec:gs ''set_home'', 13 & gs ''obj_din'', ''home['current']''">Shared apartment in Pavlovsk</a>'
+	if home_owned[14] = 1: 'Set current home as <a href="exec:gs ''set_home'', 14 & gs ''obj_din'', ''home['current']''">Grandparent''s house in Gadukino</a>'
+	if home_owned[15] = 1: 'Set current home as <a href="exec:gs ''set_home'', 15 & gs ''obj_din'', ''home['current']''">My house in the City residential district</a>'
+	if home_owned[16] = 1: 'Set current home as <a href="exec:gs ''set_home'', 16 & gs ''obj_din'', ''home['current']''">Meynold Houshold</a>'
 	
 !!Apostrophe colour correction - KS ''''
 	'</td></tr></table></center>'

locations/parkM.qsrc

@@ -151,9 +151,9 @@ if $ARGS[0] = 'sexrand3':
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Leave':		
-		if $home_town = 'pavlovsk':
+		if $home['town'] = 'pavlovsk':
 			gt 'pav_park', 'start'
-		elseif $home_town = 'oldtown':
+		elseif $home['town'] = 'oldtown':
 			gt 'parks', 'start'
 		else
 			gt 'city_park', 'start'
@@ -173,9 +173,9 @@ if $ARGS[0] = 'sexrand4':
 	gs 'cum_call', '', $lover[lover_number], 1
 	gs 'stat'
 	act 'Leave':
-		if $home_town = 'pavlovsk':
+		if $home['town'] = 'pavlovsk':
 			gt 'pav_park', 'start'
-		elseif $home_town = 'oldtown':
+		elseif $home['town'] = 'oldtown':
 			gt 'parks', 'start'
 		else
 			gt 'city_park', 'start'

locations/parksvid.qsrc

@@ -7,7 +7,7 @@ pcs_mood += 10
 gs 'stat'
 '<center><b>Park</b></center>'
 '<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/park/0.jpg"></center>'
-'You go to the park '+iif($home_town = 'pavlovsk', 'in Pavlovsk', 'in St. Petersburg')+' with <<$telsob>>.'
+'You go to the park '+iif($home['town'] = 'pavlovsk', 'in Pavlovsk', 'in St. Petersburg')+' with <<$telsob>>.'
 
 
 act 'Go for a walk':
@@ -148,7 +148,7 @@ if $ARGS[0] = '2':
 	gs 'stat'
 	'After you finish your walk, <<$telsob>> says she needs to go, she gives you a kiss on the cheek and leaves.'
 
-	if $home_town = 'pavlovsk':
+	if $home['town'] = 'pavlovsk':
 		act 'Kiss her and say goodbye': gt 'pav_park', 'start'
 	else
 		act 'Kiss her and say goodbye': gt 'city_park', 'start'
@@ -162,7 +162,7 @@ if $ARGS[0] = '3':
 	gs 'stat'
 	if $telsob = $loverdesc[lover_number]:
 		'After you finish your walk, <<$telsob>> looks at you and waits for your next move.'
-		if $home_town = 'pavlovsk':
+		if $home['town'] = 'pavlovsk':
 			act 'Kiss her and say goodbye': gt 'pav_park', 'start'
 		else
 			act 'Kiss her and say goodbye': gt 'city_park', 'start'
@@ -170,7 +170,7 @@ if $ARGS[0] = '3':
 		act 'Kiss her and invite her to your home': gt 'lezbsex', 'startloverhome'
 	else
 		'After you finish your walk, <<$telsob>> says she needs to go, she gives you a kiss on the cheek and leaves.'
-		if $home_town = 'pavlovsk':
+		if $home['town'] = 'pavlovsk':
 			act 'Leave': gt 'pav_park', 'start'
 		else
 			act 'Leave': gt 'city_park', 'start'

locations/pav_hotel.qsrc

@@ -3,6 +3,7 @@
 CLOSE ALL
 $loc_arg = $ARGS[0]
 $loc = $CURLOC
+$home_name = 'pavlovsk_hotel'
 $menu_loc = 'pav_hotel'
 $menu_arg = ''
 menu_off = 0
@@ -19,7 +20,10 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 		*clr
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'
-		act 'Go back to the High Street':minut += 3 & gt'pav_market'
+		act 'Go back to the High Street':
+			minut += 3 
+			gt'pav_market'
+		end 
 		
 		if hotresepQW = 3:
 			'The receptionist and the manager are probably at it again.'

locations/pav_market.qsrc

@@ -49,7 +49,7 @@ if prostitute['blocked'] = 0 and prostitute['gas_station'] = 1:
 end
 
 
-if curr_home = 6:
+if home['current'] = home['pavlovsk_hotel']:
 	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of the hotel, and standing beside it, you notice Vladimir</a>.'
 	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of the hotel, and standing beside it, you notice Vladimir</a>.'
 

locations/pav_shared_apt.qsrc

@@ -201,6 +201,7 @@ if $ARGS[0] = 'start':
 	$locM_arg = 'start'
 	$loc = 'pav_shared_apt'
 	$loc_arg = 'start'
+	$home_name = 'shared_apartment'
 	$goBack = $loc_arg
 	$location_type = 'private'
 	killvar '$locclass'
@@ -303,8 +304,8 @@ if $ARGS[0] = 'start':
 		act '<font color=#<<$gp_font>>><<$gp_name>>''s room</font>':gt 'pav_shared_apt', 'gpRoom'
 		act '<font color=#<<$sp_font>>><<$sp_name>>''s room</font>':gt 'pav_shared_apt', 'spRoom'
 
-		if curr_home ! 13:
-			act 'Set this apartment as your main home':gs 'set_home', 13 & gt 'pav_shared_apt', 'start'
+		if home['current'] ! home[$home_name]:
+			act 'Set this apartment as your main home':gs 'set_home', home[$home_name] & gt 'pav_shared_apt', 'start'
 		end
 	end
 
@@ -811,7 +812,7 @@ if $ARGS[0] = 'pcsRoom':
 	!gs 'subkid'
 
 	act 'Relax on your bed': gt 'bed', 'start'
-	if curr_home = 13 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 end
 	
 if $ARGS[0] = 'sofabed':

locations/pet_dog.qsrc

@@ -55,9 +55,9 @@ end
 !!--- Activities: Actions ---
 
 if $ARGS[0] = 'activities_normal':
-	if rex['count_feed'] > 0 and hour > (rex['timer_feed'] + 3) and (curr_home = 2 or (curr_home ! 2 and objects['dog_food'] > 0)):
+	if rex['count_feed'] > 0 and hour > (rex['timer_feed'] + 3) and (home['current'] = home['parents_home'] or objects['dog_food'] > 0)):
 		act 'Feed him (0:03)': gt 'pet_dog', 'feed'
-	elseif rex['count_feed'] > 0 and hour > (rex['timer_feed'] + 3) and curr_home ! 2 and objects['dog_food'] <= 0:
+	elseif rex['count_feed'] > 0 and hour > (rex['timer_feed'] + 3) and home['current'] ! home['parents_home'] and objects['dog_food'] <= 0:
 		'<br>You don''t have dog food to feed him.'
 	end
 
@@ -92,12 +92,12 @@ if $ARGS[0] = 'feed':
 	rex['relationship'] += 1
 	rex['timer_feed'] = hour
 	rex['count_feed'] -= 1
-	if curr_home ! 2: objects['dog_food'] -= 1
+	if home['current'] ! home['parents_home']: objects['dog_food'] -= 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/rex/feeding_'+rand(0,1)+'.jpg"></center>'
 	'"Come '+iif(rand(0,1) = 0, 'boy', '<<$rex[''name'']>>')+' let''s get you something to eat," you say and go into the kitchen. He '+iif(rand(0,1) = 0, 'follows and watches you fill his bowl with big thankful eyes', 'runs into the kitchen the second he hears you filling his bowl')+' before he eagerly digs in.'
 	*nl
-	if curr_home ! 2: 'You have enough dog food for <<objects[''dog_food'']>> meals.'
+	if home['current'] ! home['parents_home']: 'You have enough dog food for <<objects[''dog_food'']>> meals.'
 
 	act 'Let him eat': gt $loc, $loc_arg
 end

locations/shop.qsrc

@@ -266,7 +266,7 @@ if $ARGS[0] = 'dog_items':
 	
 	act 'Leave': gt 'shop', 'start'
 	
-	if curr_home ! 2:
+	if home['current'] ! home['parents_home']:
 		act 'Buy dog food':
 			*clr & cla
 			minut += 1

locations/shulgahall.qsrc

@@ -6,6 +6,7 @@ $locM_arg = ''
 $loc = 'shulgahall'
 $locM = 'shulgahall'
 $location_type = 'private'
+$home_name = 'sergeys_apartment'
 killvar '$locclass'
 
 if $ARGS[0] = '':
@@ -29,8 +30,9 @@ if $ARGS[0] = '':
 	*nl
 	'The hallway of Uncle Sergey''s one bedroom apartment is similar to every other apartment in the complex. There are several doors leading to the various rooms. The bedroom is Uncle Sergey''s. There''s also the kitchen, bathroom, and finally the livingroom, which Vasily uses for a bedroom.'
 	if home_owned[2] = 0:
+	!!if home['current'] = home[$home_name]
 		'There are several <a href="exec:gt ''wardrobe'', ''start''">closets</a> in the hall, which Sergey said you can use to store your clothes while you''re staying here</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
-		if curr_home = 9 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+		if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 	else
 		'There are several closets in the hall</a> and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
 	end
@@ -49,7 +51,11 @@ if $ARGS[0] = '':
 			sexev_momgg_day = daystart
 		end
 	end
-	act '<b>Leave the apartment</b>': minut += 1 & killvar '$boy' & gt 'pod_ezd','etaj_3'
+	act '<b>Leave the apartment</b>': 
+		minut += 1 
+		killvar '$boy' 
+		gt 'pod_ezd','etaj_3'
+	end
 
 	act 'Go to the living room': gt 'shulga_room', 'start','hall'
 	if instr($maintxt,'hear') > 0:

locations/stat_display.qsrc

@@ -1852,31 +1852,31 @@ if $pantyworntype ! 'none' and clit_size >= 25: $stat_msg += '<BR><font color =
 
 if $mudnerd ! '':$stat_msg += '<BR><<$mudnerd>>'
 
-if curr_home = 1:
+if home['current'] = home['city_apartment']:
 	$streetev_home = 'your apartment'
-elseif curr_home = 2 or curr_home = 9 or curr_home = 13:
+elseif $home['location'] = 'pav_complex':
 	$streetev_home = 'your apartment block'
-elseif curr_home = 3:
+elseif home['current'] = home['village_cottage']:
 	$streetev_home = 'your cottage'
-elseif curr_home = 4:
+elseif home['current'] = home['old_town_apartment']:
 	$streetev_home = 'your apartment building at Okhlopkov Square'
-elseif curr_home = 5:
+elseif home['current'] = home['matryona_mansion']:
 	$streetev_home = 'the entrance to your mansion'
-elseif curr_home = 6:
+elseif home['current'] = home['pavlovsk_hotel']:
 	$streetev_home = 'the hotel at Pavlovsk market.'
-elseif curr_home = 7:
+elseif home['current'] = home['maid_bedroom']:
 	$streetev_home = 'Tanya''s apartment'
-elseif curr_home = 8:
+elseif home['current'] = home['nikos_apartment']:
 	$streetev_home = 'Niko''s apartment block'
-elseif curr_home = 10:
+elseif home['current'] = home['lyceum_dorm']:
 	$streetev_home = 'High Street in the Pavlovsk Comercial District'
-elseif curr_home = 11:
+elseif home['current'] = home['university_dorm']:
 	$streetev_home = 'your dorm'
-elseif curr_home = 12 or curr_home = 14:
+elseif $home['town'] = 'gadukino':
 	$streetev_home = 'the street in Gadukino'
-elseif curr_home = 15:
+elseif home['current'] = home['city_house']:
 	$streetev_home = 'your house'
-elseif curr_home = 16:
+elseif home['current'] = home['meynold_household']:
 	$streetev_home = 'the Meynold Residence'
 else
 	$streetev_home = 'the city center'

locations/street_event.qsrc

@@ -30,10 +30,10 @@ if $ARGS[0] = 'city_residential':
 	streetev_hijack = 1
 	streetev_bf = 50
 	streetev_mistmeet = 15
-	if curr_home = 1:
+	if home['current'] = home['city_apartment']:
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your apartment block'
-	elseif curr_home = 15:
+	elseif home['current'] = home['city_house']:
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your house'
 	end
@@ -43,10 +43,10 @@ elseif $ARGS[0] = 'city_center':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if curr_home = 7:
+	if home['current'] = 7:
 		streetev_home = 1
 		$streetev_home = 'near the entrance to Nicholas'' Apartment'
-	elseif curr_home = 0 or curr_home > 15:
+	elseif home['current'] = 0 or home['current'] > max(home):
 		streetev_home = 1
 		$streetev_home = 'on the street'
 	end
@@ -66,13 +66,13 @@ elseif $ARGS[0] = 'pav_residential':
 	streetev_hijack = 1
 	streetev_bf = 50
 	streetev_mistmeet = 15
-	if curr_home = 2 or curr_home = 9 or curr_home = 13:
+	if $home['location'] = 'pav_complex':
 		streetev_home = 1
 		$streetev_home = 'outside your apartment block'
-	elseif curr_home = 8:
+	elseif home['current'] = home['nikos_apartment']:
 		streetev_home = 1
 		$streetev_home = 'outside Niko''s apartment block'
-	elseif curr_home = 16:
+	elseif home['current'] = home['meynold_household']:
 		streetev_home = 1
 		$streetev_home = 'outside the Meynold residence'
 
@@ -83,7 +83,7 @@ elseif $ARGS[0] = 'pav_commercial':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if curr_home = 10:
+	if $home['location'] = 'pav_commercial':
 		streetev_home = 0
 		$streetev_home = 'on the high street'
 	end
@@ -99,7 +99,7 @@ elseif $ARGS[0] = 'city_island':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if curr_home = 11:
+	if home['current'] = home['university_dorm']:
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your dorm'
 	end

locations/svidboy.qsrc

@@ -3,7 +3,7 @@
 $svidboy_home_arg = ''
 
 if $ARGS[0] = 'kinosvid':
-	if $home_town = 'pavlovsk':
+	if $home['town'] = 'pavlovsk':
 		$svidboy_home = 'gskino'
 	else
 		$svidboy_home = 'torgcentr'
@@ -58,7 +58,7 @@ if $ARGS[0] = 'kinosvid':
 end
 
 if $ARGS[0] = 'parksvid':
-	if $home_town = 'pavlovsk':
+	if $home['town'] = 'pavlovsk':
 		$svidboy_home = 'pav_park'
 		$svidboy_home_arg = 'start'
 	else
@@ -173,7 +173,7 @@ end
 if $ARGS[0] = 'parksvid2':
 	cla
 	*clr
-	if $home_town = 'pavlovsk':
+	if $home['town'] = 'pavlovsk':
 		$svidboy_home = 'pav_park'
 		$svidboy_home_arg = 'start'
 	else
@@ -256,7 +256,7 @@ if $ARGS[0] = 'parksvid2':
 end
 
 if $ARGS[0] = 'parksvid21':
-	if $home_town = 'pavlovsk':
+	if $home['town'] = 'pavlovsk':
 		$svidboy_home = 'pav_park'
 		$svidboy_home_arg = 'start'
 	else
@@ -307,7 +307,7 @@ if $ARGS[0] = 'parksvid21':
 end
 
 if $ARGS[0] = 'parksvid22':
-	if $home_town = 'pavlovsk':
+	if $home['town'] = 'pavlovsk':
 		$svidboy_home = 'pav_park'
 		$svidboy_home_arg = 'start'
 	else
@@ -425,7 +425,7 @@ if $ARGS[0] = 'billsvid':
 end
 
 if $ARGS[0] = 'kafesvid':
-	if $home_town = 'pavlovsk':
+	if $home['town'] = 'pavlovsk':
 		$svidboy_home = 'pav_commercial'
 	else
 		$svidboy_home = 'city_center'

locations/swamphouse.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	$location_type = 'indoors'
 	$loc = 'swamphouse'
 	$loc_arg = 'start'
+	$home_name 'hunters_lodge'
 	$menu_loc = 'swamphouse'
 	$menu_arg = 'start'
 	menu_off = 0

locations/telefon.qsrc

@@ -425,7 +425,7 @@ if $ARGS[0] = 'SvetaCallsNPC':
 		end
 	end
 
-	if $home_town = 'city':
+	if $home['town'] = 'city':
 		act 'Invite to the bar':
 			cla
 			'"Let''s go to the bar."'
@@ -857,7 +857,7 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 		end
 	end
 
-	if $home_town = 'city':
+	if $home['town'] = 'city':
 		act 'Invite to the pool hall':
 			cla
 			'"Let''s play pool."'
@@ -949,7 +949,7 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 0:
 		end
 	end
 
-	if $home_town = 'city':
+	if $home['town'] = 'city':
 		act 'Invite to the pool hall':
 			cla
 			'"Let''s play pool."'

locations/therapist.qsrc

@@ -1762,7 +1762,7 @@ if $ARGS[0] = 'hypnoPerv':
 		'"<i>Cunt</i>, you will spend the rest of your life with my cock inside of you. You will bear my children until you break.  Understand?"'
 		'"Yes, <i>Master</i>."'
 		'"I''ve molded you into my personal fuck toy... I think you''re ready. Where do you live?"'
-		if curr_home = 2:
+		if home['current'] = home['parents_home']:
 			'"With my family, <i>Master</i>."'
 			'"Who lives with you?" he says.'
 			'"My <<$npc_nickname[''A29'']>>, stepfather, my sister and my brother, <i>Master</i>"'
@@ -1792,11 +1792,11 @@ if $ARGS[0] = 'hypnoPerv':
 					end
 				end
 			end
-		elseif curr_home = 1:
+		elseif home['current'] = home['city_apartment']:
 			'"I live in a city residential apartment, <i>Master</i>."'
 			'"Hmm, simple enough then. We will send them a letter saying you are moving out. Then you will be mine."'
 
-		elseif curr_home = 3:
+		elseif home['current'] = home['village_cottage']:
 			! cottage in the cooperative farm
 			'"I live at my cottage in the cooperative farm, <i>Master</i>."'
 			'You have a cottage?"'
@@ -1804,7 +1804,7 @@ if $ARGS[0] = 'hypnoPerv':
 			'"Okay then... <font color="brown">You will sell your cottage to me for a single ruble. I will take you to an agency and they will officiate the sale. You will agree with everything I say while we are there. Understand, <i>Cunt</i>?"</font>"'
 			'"Yes, <i>Master</i>."'
 			'"Good, put on your clothes and come with me."'
-		elseif curr_home = 4:
+		elseif home['current'] = home['old_town_apartment']:
 			'"I live in an old town apartment, <i>Master</i>."'
 			'"That''s simple to deal with." <i>Master</i> leaves the room for a moment, then returns and hands you a sheet of paper and a pen.'
 			'"Pick up the pen and write what I say."'
@@ -1812,38 +1812,38 @@ if $ARGS[0] = 'hypnoPerv':
 			'"Hello, I will no longer be staying in the apartment. Thank you, <<$pcs_firstname>> <<$pcs_lastname>>"'
 			'He takes the paper from you and looks it over. "Good. I will send this to Nicholas'' home. Now dress and come with me."'
 			'"Yes, <i>Master</i>."'
-		elseif curr_home = 5:
+		elseif home['current'] = home['matryona_mansion']:
 			'"I live in my mansion, <i>Master</i>."'
 			'"A mansion. You live in a mansion?"'
 			'"Yes, <i>Master</i>."'
 			'"Ha! Okay then... <font color="brown">You will sell your mansion to me for a single ruble. I will take you to an agency and they will officiate the sale. You will agree with everything I say while we are there. Understand, <i>Cunt</i>?"</font>"'
 			'"Yes, <i>Master</i>."'
 			'"Good, put on your clothes and come with me."'
-		elseif curr_home = 6:
+		elseif home['current'] = home['pavlovsk_hotel']:
 			'"I live in my hotel room in Pavlovsk, <i>Master</i>."'
 			'"Couldn''t be easier then. No need to do anything. Put your clothes on and come with me."'
-		elseif curr_home = 7:
+		elseif home['current'] = home['maid_bedroom']]:
 			'"I live in Nicholas'' apartment, <i>Master</i>."'
 			'"Nicolas? Hmm." <i>Master</i> leaves the room for a moment, then returns and hands you a sheet of paper and a pen.'
 			'"Pick up the pen and write what I say."'
 			'You pick up the pen, then wait for him to speak.'
 			'"Nicolas, thank you for letting me stay at your place. I''ve found employment in the city and my own apartment! I''ll come visit when I can. Sincerly yours, <<$pcs_firstname>> <<$pcs_lastname>>"'
 			'He takes the paper from you and looks it over... "Good. I will send this to Nicholas'' home. Now dress and come with me."'
-		elseif curr_home = 8:
+		elseif home['current'] = home['nikos_apartment']:
 			'"I live in Niko''s apartment, <i>Master</i>."'
 			'"Niko? Hmm." <i>Master</i> leaves the room for a moment, then returns and hands you a sheet of paper and a pen.'
 			'"Pick up the pen and write what I say."'
 			'You pick up the pen, then wait for him to speak.'
 			'"Niko, thank you for letting me stay at your place. I''ve found employment in the city and my own apartment! I''ll come visit when I can. Sincerly yours, <<$pcs_firstname>> <<$pcs_lastname>>"'
 			'He takes the paper from you and looks it over... "Good. I will send this to your Niko''s home. Now dress and come with me."'
-		elseif curr_home = 9:
+		elseif home['current'] = [home['sergeys_apartment']:
 			'"I live in Uncle Sergey''s apartment, <i>Master</i>."'
 			'"Uncle Sergey? Hmm." <i>Master</i> leaves the room for a moment, then returns and hands you a sheet of paper and a pen.'
 			'"Pick up the pen and write what I say."'
 			'You pick up the pen, then wait for him to speak.'
 			'"Uncle Sergey, thank you for letting me stay at your place. I''ve found employment in the city and my own apartment! I''ll come visit when I can. Sincerly yours, <<$pcs_firstname>> <<$pcs_lastname>>"'
 			'He takes the paper from you and looks it over... "Good. I will send this to your your Uncle Sergey. Now dress and come with me."'
-		elseif curr_home = 10:
+		elseif home['current'] = home['lyceum_dorm']:
 			'"I live in the Lyceum school, <i>Master</i>."'
 			'"You live there? You must be a teacher then."'
 			'"Yes, <i>Master</i>."'
@@ -1852,26 +1852,26 @@ if $ARGS[0] = 'hypnoPerv':
 			'You pick up the pen, then wait for him to speak.'
 			'"Hello, I am writing this letter to inform that I will no longer be living at the Lyceum School. I have found a place of my own. Thank you, <<$pcs_firstname>> <<$pcs_lastname>>"'
 			'He takes the paper from you and looks it over... "Good. I will send this to the school. Now dress and come with me."'
-		elseif curr_home = 11:
+		elseif home['current'] = home['university_dorm']:
 			'"I live in the University halls, <i>Master</i>."'
 			'"Hmm, that''s an easy fix." <i>Master</i> leaves the room for a moment, then returns and hands you a sheet of paper and a pen.'
 			'"Pick up the pen and write what I say."'
 			'You pick up the pen, then wait for him to speak.'
 			'"Hello, I will no longer be using the halls as my residence. Thank you, <<$pcs_firstname>> <<$pcs_lastname>>"'
 			'He takes the paper from you and looks it over... "Good. I will send this to the university. Now dress and come with me."'
-		elseif curr_home = 12:
+		elseif home['current'] = home['hunters_lodge']:
 			'"I live in a hunter''s lodge in Gadukino, <i>Master</i>."'
 			'"A hunter''s lodge?"'
 			'"Yes, <i>Master</i>, in a swamp."'
 			'<i>Master</i> scratches his head and looks down at you with a mix of pity and disgust. "Well, that does makes things easier. Put your clothes on and come with me." he says'
-		elseif curr_home = 13:
+		elseif home['current'] = home['shared_apartment']:
 			'"I live in a shared apartment in Pavlovsk, <i>Master</i>."'
 			'"A shared apartment? Hmm." <i>Master</i> leaves the room for a moment, then returns and hands you a sheet of paper and a pen.'
 			'"Pick up the pen and write what I say."'
 			'You pick up the pen, then wait for him to speak.'
 			'"Hello, I have found elsewhere to live and will no longer be residing with you all. Sincerly yours, <<$pcs_firstname>> <<$pcs_lastname>>"'
 			'He takes the paper from you and looks it over... "Good. I will send this to the apartment you were staying in. Now dress and come with me."'
-		elseif curr_home = 14:
+		elseif home['current'] = home['grandpatents_home']:
 			'"I live in my grandparent''s house in Gadukino, <i>Master</i>."'
 			'"Hmm, that''s an easy fix." <i>Master</i> leaves the room for a moment, then returns and hands you a sheet of paper and a pen.'
 			'"Pick up the pen and write what I say."'

locations/uni_dorm.qsrc

@@ -4,6 +4,7 @@
 if $ARGS[0] = 'start':
 	*clr & cla
 	minut += 5
+	$home_name = 'univresity_dorm'
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'start'
 	menu_off = 0
@@ -51,7 +52,11 @@ if $ARGS[0] = 'start':
 				if npc_rel['A84'] < 40:
 					'You walk over to the counter and pull out your ID. "I''m here to visit Kendra."' 
 					'The woman gives you a look of complete disgust. "It seems like she''s gotten tired of you since you''re no longer on the guest list. Now get out of here before I call security." Surprised, you turn and quickly leave before the woman calls security.'
-					act 'Leave': minut += 5 & gt 'city_island'
+					act 'Leave': 
+						minut += 5 
+						killvar 'university_dorm'
+						gt 'city_island'
+					end
 				else
 					'You walk over to the counter and pull out your ID. "I''m here to visit Kendra."' 
 					'The woman gives you a look of complete disgust. "What, a man not good enough for you? Go ahead and serve that black whore. She''s on the eighth floor, room 801." She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
@@ -60,7 +65,10 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	act 'Leave':gt 'city_island'
+	act 'Leave':
+		killvar 'university_dorm'
+		gt 'city_island'
+	end
 end
 
 if $ARGS[0] = 'elevator':
@@ -416,10 +424,10 @@ if $ARGS[0] = 'dorm_room':
 	dynamic $wearpan
 	dynamic $removepan
 
-	if curr_home = 11 and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 	
-	if curr_home ! 11:
-		act 'Set this dorm room as your main home':gs 'set_home', 11 & gt 'uni_dorm', 'dorm_room'
+	if home['current'] ! home[$home_name]:
+		act 'Set this dorm room as your main home':gs 'set_home', home[$home_name] & gt 'uni_dorm', 'dorm_room'
 	end
 end