[fixed/changed/added] Fixed it so that you can still meet you dat if you are a university student. Did by changing it to use curr:home and added meeting points for the homes that was missing.

locations/city_mansion_entrance.qsrc

@@ -29,6 +29,21 @@ if $ARGS[0] = '':
 		'<a href="exec:gs ''carF'', ''start''">Your <<$car>></a> is parked here.'
 	end
 
+	if curr_home = 5:
+		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>.'
+
+		if hour = meethour[0]:
+			if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting at the entrance to your mansion.</b>'
+		end
+		if hour = meethour[1]:
+			if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting at the entrance to your mansion.</b>'
+		end
+		if hour = meethour[2]:
+			if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting at the entrance to your mansion.</b>'
+		end
+	end
+
 	act 'Go to the suburbs':minut += 10 & gt 'city_suburbs', 'start'
 	if home_owned[5] = 3: act 'Walk inside the mansion': minut += 4 & gt 'city_mansion_residence_1', 'yfoyer'
 

locations/dachi.qsrc

@@ -34,6 +34,21 @@ if home_owned[3] > 0:
 	end
 end
 
+if curr_home = 3:
+	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>.'
+
+	if hour = meethour[0]:
+		if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting at the entrance to your yard.</b>'
+	end
+	if hour = meethour[1]:
+		if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting at the entrance to your yard.</b>'
+	end
+	if hour = meethour[2]:
+		if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting at the entrance to your yard.</b>'
+	end
+end
+
 if etoexhib < 13:'You feel a slight presence of magic.'
 
 act 'Stroll through the alleys':gt 'etoexhib', 'pos2'

locations/gadukino.qsrc

@@ -103,6 +103,20 @@ if $ARGS[0] = '':
 			'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'
 		end
+		if curr_home = 12 or curr_home = 14:
+			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>.'
+
+			if hour = meethour[0]:
+				if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting in the street.</b>'
+			end
+			if hour = meethour[1]:
+				if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting in the street.</b>'
+			end
+			if hour = meethour[2]:
+				if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting in the street.</b>'
+			end
+		end
 		if npc_rel['A60'] > 0 and metmira = 1:
 			'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
 			act 'Go to Mira''s house': minut += 5 & gt 'miroslavahome', 'start'

locations/liames.qsrc

@@ -74,10 +74,19 @@ if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on th
 
 act 'wait':gs 'obj_din', 'wait'
 
-if home_owned[4] = 1 and hour = meethour:
-	if svidanie[0] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 0 & gt ''lover_meet'',''start''"><<$loverdesc[0]>></a></b>'
-	if svidanie[1] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 1 & gt ''lover_meet'',''start''"><<$loverdesc[1]>></a></b>'
-	if svidanie[2] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 2 & gt ''lover_meet'',''start''"><<$loverdesc[2]>></a></b>'
+if curr_home = 4:
+	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>.'
+
+	if hour = meethour[0]:
+		if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting at the entrance to your apartment building.</b>'
+	end
+	if hour = meethour[1]:
+		if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting at the entrance to your apartment building.</b>'
+	end
+	if hour = meethour[2]:
+		if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting at the entrance to your apartment building.</b>'
+	end
 end
 
 if rand(0,50) = 50 and fame['event_day'] ! daystart and hour > 8 and hour < 21:

locations/pav_market.qsrc

@@ -40,6 +40,21 @@ end
 *nl
 'A rather run-down <a href="exec:minut += 1 & gt ''HotelHole''">hotel</a> is just across the square, where travelers can spend the night. The manager is always looking for maids among the local young girls. Because of it''s frequent use by the local prostitutes, most people prefer to stay at the middle-class hotel by the main road.'
 
+if curr_home = 6:
+	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>.'
+
+	if hour = meethour[0]:
+		if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting in front of the hotel.</b>'
+	end
+	if hour = meethour[1]:
+		if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting in front of the hotel.</b>'
+	end
+	if hour = meethour[2]:
+		if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting in front of the hotel.</b>'
+	end
+end
+
 if dimaRevChoice = 5 and dimaRevenge = 4 and dimaTrain = 0: gt 'dimaRevenge', dimaRevenge
 
 if kidaloa = 0:

locations/stat_display.qsrc

@@ -1801,16 +1801,32 @@ if $pantyworntype ! 'none' and clit_size >= 25: $stat_msg += '<BR><font color =
 
 if $mudnerd ! '':$stat_msg += '<BR><<$mudnerd>>'
 
-if home_owned[1] > 0:
+if curr_home = 1:
 	$streetev_home = 'your apartment'
-elseif tanwork = 1:
+elseif curr_home = 2 or curr_home = 9 or curr_home = 13:
+	$streetev_home = 'your apartment block'
+elseif curr_home = 3:
+	$streetev_home = 'your cottage'
+elseif curr_home = 4:
+	$streetev_home = 'your apartment building at Okhlopkov Square'
+elseif curr_home = 5:
+	$streetev_home = 'the entrance to your mansion'
+elseif curr_home = 6:
+	$streetev_home = 'the hotel at Pavlovsk market.'
+elseif curr_home = 7:
 	$streetev_home = 'Tanya''s apartment'
-elseif func('uniutil', 'student', 'enrolled'):
+elseif curr_home = 8:
+	$streetev_home = 'Niko''s apartment block'
+elseif curr_home = 10:
+	$streetev_home = 'High Street in the Pavlovsk Comercial District'
+elseif curr_home = 11:
 	$streetev_home = 'your dorm'
-elseif home_owned[2] = 1:
-	$streetev_home = 'outside your apartment block'
+elseif curr_home = 12 or curr_home = 14:
+	$streetev_home = 'the street in Gadukino'
+elseif curr_home = 15:
+	$streetev_home = 'your house'
 else
-	$streetev_home = 'the train station'
+	$streetev_home = 'the city center'
 end
 
 if StrongNarkota > 20 or jointhigh > 0:$stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'

locations/street_event.qsrc

@@ -30,9 +30,12 @@ if $ARGS[0] = 'city_residential':
 	streetev_hijack = 1
 	streetev_bf = 50
 	streetev_mistmeet = 15
-	if home_owned[1] > 0:
+	if curr_home = 1:
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your apartment block'
+	elseif curr_home = 15:
+		streetev_home = 1
+		$streetev_home = 'near the entrance to your house'
 	end
 elseif $ARGS[0] = 'city_center':
 	$streetev_title = '<center><b>City center</b></center>'
@@ -40,9 +43,12 @@ elseif $ARGS[0] = 'city_center':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if tanwork = 1:
+	if curr_home = 7:
+		streetev_home = 1
+		$streetev_home = 'near the entrance to Nicholas'' Apartment'
+	elseif curr_home = 0 or curr_home > 15:
 		streetev_home = 1
-		$streetev_home = 'near the entrance to your home'
+		$streetev_home = 'on the street'
 	end
 elseif $ARGS[0] = 'city_industrial':
 	$streetev_title = '<center><b>City industrial region</b></center>'
@@ -60,9 +66,12 @@ elseif $ARGS[0] = 'pav_residential':
 	streetev_hijack = 1
 	streetev_bf = 50
 	streetev_mistmeet = 15
-	if home_owned[2] = 1:
+	if curr_home = 2 or curr_home = 9 or curr_home = 13:
 		streetev_home = 1
 		$streetev_home = 'outside your apartment block'
+	elseif curr_home = 8:
+		streetev_home = 1
+		$streetev_home = 'outside Niko''s apartment block'
 	end
 elseif $ARGS[0] = 'pav_commercial':
 	$streetev_title = '<center><b>Pavlovsk high street</b></center>'
@@ -70,7 +79,7 @@ elseif $ARGS[0] = 'pav_commercial':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if home_owned[1] = 0 and tanwork = 0 and func('uniutil', 'student', 'not_enrolled'):
+	if curr_home = 10:
 		streetev_home = 0
 		$streetev_home = 'on the high street'
 	end
@@ -86,7 +95,7 @@ elseif $ARGS[0] = 'city_island':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if func('uniutil', 'student', 'enrolled'):
+	if curr_home = 11:
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your dorm'
 	end
@@ -143,8 +152,8 @@ if $ARGS[1] = 'extras':
 	end
 
 	if streetev_home = 1:
-		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 building, 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 building, and standing beside it, you notice Vladimir</a>.'
+		if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked <<$streetev_home>>, 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 <<$streetev_home>>, and standing beside it, you notice Vladimir</a>.'
 
 		if hour = meethour[0]:
 			if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting <<$streetev_home>>.</b>'