Updated to use the new location and variables a

locations/Cheatmenu_din.qsrc

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

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 home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $hotel = 'pav_hotel' and $home['current'] = $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 home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $hotel = 'pav_hotel' and $home['current'] = $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 home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $hotel = 'pav_hotel' and $home['current'] = $home_name and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

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', home[$home_name]
+				gs 'homes_properties', 'set_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', home[$home_name]
+				if $set_homeyn = 'yes': gs 'homes_properties', 'set_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', home[$home_name]
+				gs 'homes_properties', 'set_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', home[$home_name]
+				if $set_homeyn = 'yes': gs 'homes_properties', 'set_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', home[$home_name]
+		gs 'homes_properties', 'set_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', home[$home_name]
+		if $set_homeyn = 'yes': gs 'homes_properties', 'set_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', home[$home_name]
+		gs 'homes_properties', 'set_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', home[$home_name]
+		if $set_homeyn = 'yes': gs 'homes_properties', 'set_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', home[$home_name]
+		gs 'homes_properties', 'set_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', home[$home_name]
+		if $set_homeyn = 'yes': gs 'homes_properties', 'set_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', home[$home_name]
+		gs 'homes_properties', 'set_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', home[$home_name]
+		if $set_homeyn = 'yes': gs 'homes_properties', 'set_home', $home_name
 		killvar '$set_homeyn'
 	end
 	gs'stat'

locations/bedr.qsrc

@@ -229,7 +229,7 @@ gs 'subkid'
 
 act 'Relax on your bed': gt 'bed', 'start'
 
-if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+if $home['current'] = $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 home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+if $home['current'] = $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 home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+		if $home['current'] = $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 home['current'] = home['parents_home']:
+	if $home['current'] = 'parents_home':
 		if npc_rel['A34'] > 50:
 			minut += 10
 			gs 'stat'

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 home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
+	if $home['current'] = $home_name and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
 end
 
 --- city_house_res_bedr ---------------------------------

locations/city_house_res_misc.qsrc

@@ -37,8 +37,8 @@ if $ARGS[0] = 'fronty':
 		minut += 10
 		gt 'city_residential'
 	end
-	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'
+	if $home['current'] ! $home_name:
+		act 'Set this house as your main home':gs 'homes_properties', 'set_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 home['current'] = home['city_apartment']:
+					if $home['current'] = 'city_apartment':
 						act 'Agree':
 							cla & *clr
 							minut += 5

locations/city_mansion_entrance.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = '':
 		'<a href="exec:gs ''carF'', ''start''">Your <<$car>></a> is parked here.'
 	end
 
-	if home['current'] = home[$home_name]:
+	if $home['current'] = $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>.'
 

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 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'
+	if $home['current'] ! $home_name:
+		act 'Set this apartment as your main home':gs 'homes_properties', 'set_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 home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $home['current'] = $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 home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $home['current'] = $home_name and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
 !!-------------------------------------------------------------------------------------------------------------------------------------
 !!------------------------------------------------------- Music related actions come here ---------------------------------------------

locations/dachi.qsrc

@@ -34,7 +34,7 @@ if home_owned[3] > 0:
 	end
 end
 
-if home['current'] = home['village_cottage']:
+if $home['current'] = '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,7 +6,7 @@
 ! 3 = St. Petersburg Apt
 
 if $ARGS[0] = 'go_home':
-	if home['current'] = home['hunters_lodge']:
+	if $home['current'] = 'hunters_lodge':
 		gt 'swamp_yard','start'		
 	elseif $home['location'] = 'pav_complex':
 		gt 'pav_complex', 'start'
@@ -16,9 +16,9 @@ if $ARGS[0] = 'go_home':
 end
 
 if $ARGS[0] = 'go_straight_home':
-	if home['current'] = home['lyceum_dorm']:
+	if $home['current'] = 'lyceum_dorm':
 		gt 'etoexhib', 'pos40'
-	elseif home['current'] = home['university_dorm']:
+	elseif $home['current'] = 'university_dorm':
 		gt 'uni_dorm', 'dorm_room'
 	else
 		gt $home['entrance'], 'start'

locations/dom_gor.qsrc

@@ -186,10 +186,10 @@ act 'Go out onto the street':
 
 end
 
-if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+if $home['current'] = $home_name and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
-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'
+if $home['current'] ! $home_name:
+	act 'Set the this small room as your main home':gs 'homes_properties', 'set_home', $home_name & gt 'dom_gor'
 end
 
 --- dom_gor ---------------------------------

locations/gaddvor.qsrc

@@ -39,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 home['current'] = home[$home_name] and hour > 7 and hour < 20 and rex['owned'] = 1:
+		if $home['current'] = $home_name and hour > 7 and hour < 20 and rex['owned'] = 1:
 			if $status['dog'] = '':
 				gt 'pet_dog', 'name'
 			else

locations/gadhouse.qsrc

@@ -502,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 home['current'] = home['grandparents_house'] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
+	if $home['current'] = 'grandparents_house' and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
 end
 
 if $ARGS[0] = 'grandma':

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 home['current'] = home['hunters_lodge'] or home['current'] = home['grandparents_house']:
+		if $home['current'] = 'hunters_lodge' or $home['current'] = '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 home['current'] = home['parents_home']:
+	if $home['current'] = '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 home['current'] = 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 home['current'] = 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 home['current'] = 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', home['city_apartment']
+	if mid($start_type,1,4) = 'city': gs 'homes_properties', 'set_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', home['parents_home']
+	gs 'homes_properties', 'set_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', home['parents_home']
+	gs 'homes_properties', 'set_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', home['university_dorm']
+	gs 'homes_properties', 'set_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/korr.qsrc

@@ -56,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 home['current'] ! home[$home_name]:
-	act 'Set this apartment as your main home':gs 'set_home', home[$home_name] & gt 'korr'
+if $home['current'] ! $home_name:
+	act 'Set this apartment as your main home':gs 'homes_properties', 'set_home', $home_name & gt 'korr'
 else
 	if $status['dog'] ! 'blocked' and menu_off = 0 and rex['owned'] = 1:
 		if rex['status'] = 0:

locations/korr2x.qsrc

@@ -92,8 +92,8 @@ if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	end
 end
 
-if home['current'] ! home[$home_name]:
-	act 'Set this apartment as your main home':gs 'set_home', home[$home_name] & gt 'korr2x'
+if $home['current'] ! $home_name:
+	act 'Set this apartment as your main home':gs 'homes_properties', 'set_home', $home_name & gt 'korr2x'
 else
 	if $status['dog'] ! 'blocked' and menu_off = 0 and rex['owned'] = 1:
 		if rex['status'] = 0:

locations/korrPar.qsrc

@@ -149,8 +149,8 @@ if NatbelQW['QWstage'] >= 4 and week < 6 and (hour = 6 or hour = 7) and kanikuli
 	act 'Go to Natasha''s apartment': gt 'natbel_cp_1', 'carrybooks'
 end
 
-if home['current'] ! home[$home_name]:
-	act 'Set this apartment as your main home':gs 'set_home', home[$home_name] & gt 'korrPar'
+if $home['current'] ! $home_name:
+	act 'Set this apartment as your main home':gs 'homes_properties', 'set_home', $home_name & gt 'korrPar'
 else
 	if $status['dog'] ! 'blocked' and menu_off = 0 and rex['owned'] = 1:
 		if rex['status'] = 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 home['current'] = home['old_town_apartment']:
+if $home['current'] = '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

@@ -130,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 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'
+	if $home['current'] ! $home_name and home_owned[16] = 1:
+		act 'Set this household as your main home':gs 'homes_properties', 'set_home', $home_name & gt 'mey_home', 'start'
 	end
 
 	!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
@@ -272,7 +272,7 @@ if $ARGS[0] = '3':
 	act 'Relax on your bed': gt 'bed', 'start'
 
 	act 'Wait':gs 'obj_din', 'wait'
-	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'	
+	if $home['current'] = $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/nichBedroomServant.qsrc

@@ -147,10 +147,10 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		gs 'nichChore','inspect','servant'
 	
 	end
-	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $home['current'] = $home_name and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 	
-	if home['current'] ! home[$home_name]:
-		act 'Set the Nicholas house as your main home':gs 'set_home', home[$home_name] & gt 'nichBedroomServant'
+	if $home['current'] ! $home_name:
+		act 'Set the Nicholas house as your main home':gs 'homes_properties', 'set_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'', ''home['current']''">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'', ''home['current']''"><<$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,7 +334,7 @@ if $ARGS[0] = 'description':
 	'</td></tr></table></center>'
 end
 
-if $ARGS[0] = 'home['current']':
+if $ARGS[0] = 'curr_home':
 	*clr & cla
 	!'<center><img src="images/system/icons/description.png"><br></center>'
 	'<center><h1><<$pcs_firstname>>''s Home Location</h1></center>'
@@ -344,22 +344,22 @@ if $ARGS[0] = 'home['current']':
 	*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'', ''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>'
+	if home_owned[1] > 0: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''city_apartment'' & gs ''obj_din'', <<$home[''current'']>>">City residential apartment</a>'
+	if home_owned[2] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''parents_home'' & gs ''obj_din'', <<$home[''current'']>>">Parent''s home in Pavlovsk</a>'
+	if home_owned[3] > 0: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''village_cottage'' & 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 ''homes_properties'', ''set_home'', ''old_town_apartment'' & gs ''obj_din'', <<$home[''current'']>>">Old town apartment</a>'
+	if home_owned[5] > 2: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''matryona_mansion'' & gs ''obj_din'', <<$home[''current'']>>">Matryona mansion</a>'
+	if home_owned[6] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''pavlovsk_hotel'' & gs ''obj_din'', <<$home[''current'']>>">My hotel room in Pavlovsk</a>'
+	if home_owned[7] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''maid_bedroom'' & gs ''obj_din'', <<$home[''current'']>>">Nicholas'' apartment</a>'
+	if home_owned[8] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''nikos_apartment'' & gs ''obj_din'', <<$home[''current'']>>">Niko''s apartment</a>'
+	if home_owned[9] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''sergeys_apartment'' & gs ''obj_din'', <<$home[''current'']>>">Uncle Sergey''s apartment</a>'
+	if home_owned[10] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''lyceum_dorm'' & gs ''obj_din'', <<$home[''current'']>>">Lyceum school</a>'
+	if home_owned[11] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''university_dorm'' & gs ''obj_din'', <<$home[''current'']>>">University halls</a>'
+	if home_owned[12] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''hunters_lodge'' & gs ''obj_din'', <<$home[''current'']>>">Hunter''s lodge in Gadukino</a>'
+	if home_owned[13] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''shared_apartment'' & gs ''obj_din'', <<$home[''current'']>>">Shared apartment in Pavlovsk</a>'
+	if home_owned[14] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''grandparents_house'' & gs ''obj_din'', <<$home[''current'']>>">Grandparent''s house in Gadukino</a>'
+	if home_owned[15] = 1: 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''city_house'' & 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 ''homes_properties'', ''set_home'', ''meynold_household'' & gs ''obj_din'', <<$home[''current'']>>">Meynold Houshold</a>'
 	
 !!Apostrophe colour correction - KS ''''
 	'</td></tr></table></center>'

locations/pav_market.qsrc

@@ -49,7 +49,7 @@ if prostitute['blocked'] = 0 and prostitute['gas_station'] = 1:
 end
 
 
-if home['current'] = home['pavlovsk_hotel']:
+if $home['current'] = '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

@@ -304,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 home['current'] ! home[$home_name]:
-			act 'Set this apartment as your main home':gs 'set_home', home[$home_name] & gt 'pav_shared_apt', 'start'
+		if $home['current'] ! $home_name:
+			act 'Set this apartment as your main home':gs 'homes_properties', 'set_home', $home_name & gt 'pav_shared_apt', 'start'
 		end
 	end
 
@@ -812,7 +812,7 @@ if $ARGS[0] = 'pcsRoom':
 	!gs 'subkid'
 
 	act 'Relax on your bed': gt 'bed', 'start'
-	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $home['current'] = $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 (home['current'] = home['parents_home'] or objects['dog_food'] > 0)):
+	if rex['count_feed'] > 0 and hour > (rex['timer_feed'] + 3) and ($home['current'] = '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 home['current'] ! home['parents_home'] and objects['dog_food'] <= 0:
+	elseif rex['count_feed'] > 0 and hour > (rex['timer_feed'] + 3) and $home['current'] ! '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 home['current'] ! home['parents_home']: objects['dog_food'] -= 1
+	if $home['current'] ! '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 home['current'] ! home['parents_home']: 'You have enough dog food for <<objects[''dog_food'']>> meals.'
+	if $home['current'] ! 'parents_home': 'You have enough dog food for <<objects[''dog_food'']>> meals.'
 
 	act 'Let him eat': gt $loc, $loc_arg
 end

locations/shulgahall.qsrc

@@ -30,9 +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]
+	!!if $home['current'] = $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 home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+		if $home['current'] = $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

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 home['current'] = home['city_apartment']:
+if $home['current'] = 'city_apartment':
 	$streetev_home = 'your apartment'
 elseif $home['location'] = 'pav_complex':
 	$streetev_home = 'your apartment block'
-elseif home['current'] = home['village_cottage']:
+elseif $home['current'] = 'village_cottage':
 	$streetev_home = 'your cottage'
-elseif home['current'] = home['old_town_apartment']:
+elseif $home['current'] = 'old_town_apartment':
 	$streetev_home = 'your apartment building at Okhlopkov Square'
-elseif home['current'] = home['matryona_mansion']:
+elseif $home['current'] = 'matryona_mansion':
 	$streetev_home = 'the entrance to your mansion'
-elseif home['current'] = home['pavlovsk_hotel']:
+elseif $home['current'] = 'pavlovsk_hotel':
 	$streetev_home = 'the hotel at Pavlovsk market.'
-elseif home['current'] = home['maid_bedroom']:
+elseif $home['current'] = 'maid_bedroom':
 	$streetev_home = 'Tanya''s apartment'
-elseif home['current'] = home['nikos_apartment']:
+elseif $home['current'] = 'nikos_apartment':
 	$streetev_home = 'Niko''s apartment block'
-elseif home['current'] = home['lyceum_dorm']:
+elseif $home['current'] = 'lyceum_dorm':
 	$streetev_home = 'High Street in the Pavlovsk Comercial District'
-elseif home['current'] = home['university_dorm']:
+elseif $home['current'] = 'university_dorm':
 	$streetev_home = 'your dorm'
 elseif $home['town'] = 'gadukino':
 	$streetev_home = 'the street in Gadukino'
-elseif home['current'] = home['city_house']:
+elseif $home['current'] = 'city_house':
 	$streetev_home = 'your house'
-elseif home['current'] = home['meynold_household']:
+elseif $home['current'] = '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 home['current'] = home['city_apartment']:
+	if $home['current'] = 'city_apartment':
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your apartment block'
-	elseif home['current'] = home['city_house']:
+	elseif $home['current'] = '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 home['current'] = 7:
+	if $home['current'] = 7:
 		streetev_home = 1
 		$streetev_home = 'near the entrance to Nicholas'' Apartment'
-	elseif home['current'] = 0 or home['current'] > max(home):
+	elseif $home['current'] = '':
 		streetev_home = 1
 		$streetev_home = 'on the street'
 	end
@@ -69,10 +69,10 @@ elseif $ARGS[0] = 'pav_residential':
 	if $home['location'] = 'pav_complex':
 		streetev_home = 1
 		$streetev_home = 'outside your apartment block'
-	elseif home['current'] = home['nikos_apartment']:
+	elseif $home['current'] = 'nikos_apartment':
 		streetev_home = 1
 		$streetev_home = 'outside Niko''s apartment block'
-	elseif home['current'] = home['meynold_household']:
+	elseif $home['current'] = 'meynold_household':
 		streetev_home = 1
 		$streetev_home = 'outside the Meynold residence'
 
@@ -99,7 +99,7 @@ elseif $ARGS[0] = 'city_island':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if home['current'] = home['university_dorm']:
+	if $home['current'] = 'university_dorm':
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your dorm'
 	end

locations/therapist.qsrc

@@ -1763,7 +1763,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 home['current'] = home['parents_home']:
+		if $home['current'] = '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>"'
@@ -1793,11 +1793,11 @@ if $ARGS[0] = 'hypnoPerv':
 					end
 				end
 			end
-		elseif home['current'] = home['city_apartment']:
+		elseif $home['current'] = '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 home['current'] = home['village_cottage']:
+		elseif $home['current'] = 'village_cottage':
 			! cottage in the cooperative farm
 			'"I live at my cottage in the cooperative farm, <i>Master</i>."'
 			'You have a cottage?"'
@@ -1805,7 +1805,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 home['current'] = home['old_town_apartment']:
+		elseif $home['current'] = '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."'
@@ -1813,38 +1813,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 home['current'] = home['matryona_mansion']:
+		elseif $home['current'] = '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 home['current'] = home['pavlovsk_hotel']:
+		elseif $home['current'] = '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 home['current'] = home['maid_bedroom']]:
+		elseif $home['current'] = '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 home['current'] = home['nikos_apartment']:
+		elseif $home['current'] = '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 home['current'] = [home['sergeys_apartment']:
+		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 home['current'] = home['lyceum_dorm']:
+		elseif $home['current'] = 'lyceum_dorm':
 			'"I live in the Lyceum school, <i>Master</i>."'
 			'"You live there? You must be a teacher then."'
 			'"Yes, <i>Master</i>."'
@@ -1853,26 +1853,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 home['current'] = home['university_dorm']:
+		elseif $home['current'] = '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 home['current'] = home['hunters_lodge']:
+		elseif $home['current'] = '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 home['current'] = home['shared_apartment']:
+		elseif $home['current'] = '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 home['current'] = home['grandpatents_home']:
+		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

@@ -424,10 +424,10 @@ if $ARGS[0] = 'dorm_room':
 	dynamic $wearpan
 	dynamic $removepan
 
-	if home['current'] = home[$home_name] and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	if $home['current'] = $home_name and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
 	
-	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'
+	if $home['current'] ! $home_name:
+		act 'Set this dorm room as your main home':gs 'homes_properties', 'set_home', $home_name & gt 'uni_dorm', 'dorm_room'
 	end
 end