[fixed] resolved most inconsistencies where logic was different depending on whether enable_tablemap is true (exception is the different access conditions in pav_complex for accessing the Shulgin families apartment as still need to determine which condition is correct), fixed a line where the variable for the number of columns to pass to show_table wasn't populated in city_residential, and fixed some spelling/grammar issues in the various enable_tablemap code blocks

locations/city_center.qsrc

@@ -253,7 +253,7 @@ end
 
 if Enable_tablemap = 0:
 	if nichTanyaRelationship = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanyaFuckLast ! daystart:'<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment where Tanya lives</a>.'
-	if nichWork = 2:'<a href="exec:gt ''nichApartment''">Nicholas''</a> apartment where you work as a live in maid.'
+	if nichWork = 2:'<a href="exec:gt ''nichApartment''">Nicholas''s</a> apartment where you work as a live in maid.'
 	if izoldaQW >= 1:'Your friend <a href="exec:gt ''qwIzoldaApp''">Isolde''s</a> apartment.'
 	if mainQW >= 1:'<a href="exec:gt ''tatiana_lab'', ''start''">Tatiana''s</a> secret hideout.'
 	if yaq = 1:'<a href="exec:gt ''yarik'', ''start''">Yaroslav</a> from the office''s apartment.'
@@ -261,11 +261,11 @@ if Enable_tablemap = 0:
 else
 	st_count=0 & $show_table=''
 	if nichTanyaRelationship = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanyaFuckLast ! daystart:gs'show_table','<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment</a> where Tanya lives','3'
-	if nichWork = 2:gs'show_table','<a href="exec:gt ''nichApartment''">Nicholas''</a> apartment','3'
-	if izoldaQW >= 1:gs'show_table','<a href="exec:gt ''qwIzoldaApp''">Isoldes</a> apartment','3'
+	if nichWork = 2:gs'show_table','<a href="exec:gt ''nichApartment''">Nicholas''s</a> apartment','3'
+	if izoldaQW >= 1:gs'show_table','<a href="exec:gt ''qwIzoldaApp''">Isolde''s</a> apartment','3'
 	if mainQW >= 1:gs'show_table','<a href="exec:gt ''tatiana_lab'', ''start''">Tatiana''s</a> secret hideout','3'
-	if yaq = 1:gs'show_table','<a href="exec:gt ''yarik'', ''start''">Yaroslavs</a> apartment','3'
-	if peter > 0:gs'show_table','<a href="exec:gt ''peterroom'', ''start_door''">Peters</a> apartment','3'
+	if yaq = 1:gs'show_table','<a href="exec:gt ''yarik'', ''start''">Yaroslav''s</a> apartment','3'
+	if peter > 0:gs'show_table','<a href="exec:gt ''peterroom'', ''start_door''">Peter''s</a> apartment','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 

locations/city_residential.qsrc

@@ -91,24 +91,24 @@ gs 'taxi'
 
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:$loc = ''city_residential'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if Enable_tablemap = 0:
-	if katkey = 1:'<a href="exec:gt ''katspalnya'', ''start''">Kats</a> apartment'
-	if IrinaQW >= 1:'<a href="exec:gt ''city_irinaroom'', ''start''">Irenes</a> apartment is not far away from yours.'
-	if hour >= 16 and hour < 22 and dimaQW > 0:'<a href="exec:gt ''city_dima'', ''start''">Dimas</a> apartment'
-	if klofQW >= 2:'<a href="exec:gt ''city_jorahouse'', ''start''">Joras</a> apartment'
+	if katkey = 1:'<a href="exec:gt ''katspalnya'', ''start''">Kat''s</a> apartment'
+	if IrinaQW >= 1:'<a href="exec:gt ''city_irinaroom'', ''start''">Irene''s</a> apartment is not far away from yours.'
+	if hour >= 16 and hour < 22 and dimaQW > 0:'<a href="exec:gt ''city_dima'', ''start''">Dima''s</a> apartment'
+	if klofQW >= 2:'<a href="exec:gt ''city_jorahouse'', ''start''">Jora''s</a> apartment'
 else
 	st_count=0 & $show_table=''
-	if katkey = 1:gs'show_table','<a href="exec:gt ''katspalnya'', ''start''">Kats</a> apartment','3'
-	if IrinaQW >= 1:gs'show_table','<a href="exec:gt ''city_irinaroom'', ''start''">Irenes</a> apartment is not far away from yours.','3'
-	if hour >= 16 and hour < 22 and dimaQW > 0:gs'show_table','<a href="exec:gt ''city_dima'', ''start''">Dimas</a> apartment','3'
-	if klofQW >= 2:gs'show_table','<a href="exec:gt ''city_jorahouse'', ''start''">Joras</a> apartment','3'
+	if katkey = 1:gs'show_table','<a href="exec:gt ''katspalnya'', ''start''">Kat''s</a> apartment','3'
+	if IrinaQW >= 1:gs'show_table','<a href="exec:gt ''city_irinaroom'', ''start''">Irene''s</a> apartment is not far away from yours.','3'
+	if hour >= 16 and hour < 22 and dimaQW > 0:gs'show_table','<a href="exec:gt ''city_dima'', ''start''">Dima''s</a> apartment','3'
+	if klofQW >= 2:gs'show_table','<a href="exec:gt ''city_jorahouse'', ''start''">Jora''s</a> apartment','3'
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
-		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalya Petrovnas</a> apartment.'
+		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalya Petrovna''s</a> apartment.', '3'
 	elseif lesbiday ! daystart and subdom = 2:
-		gs'show_table','<a href="exec:gt ''lesbisubhouse'', ''start''">Your slaves</a> apartment.','3'
+		gs'show_table','<a href="exec:gt ''lesbisubhouse'', ''start''">Your slave''s</a> apartment.','3'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 13:
-		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Mistress''</a> apartment.','3'
+		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Mistress''s</a> apartment.','3'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 13:
-		gs'show_table','<a href="exec:gt ''lesbimistress'', ''start''">Mistress''</a> apartment.','3'
+		gs'show_table','<a href="exec:gt ''lesbimistress'', ''start''">Mistress''s</a> apartment.','3'
 	end
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
@@ -156,9 +156,9 @@ if Enable_tablemap = 0:
 	elseif lesbiday ! daystart and subdom = 2:
 		'<a href="exec:gt ''lesbisubhouse'', ''start''">Your slave''s</a> apartment.'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 13:
-		'<a href="exec:gt ''lesbidomhouse'', ''start''">Mistress''</a> apartment.'
+		'<a href="exec:gt ''lesbidomhouse'', ''start''">Mistress''s</a> apartment.'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 13:
-		'<a href="exec:gt ''lesbimistress'', ''start''">Mistress''</a> apartment.'
+		'<a href="exec:gt ''lesbimistress'', ''start''">Mistress''s</a> apartment.'
 	end
 end
 

locations/gschool_grounds.qsrc

@@ -273,9 +273,10 @@ if $ARGS[0] = 'main':
 			st_count=0 & $show_table=''
 			if anushkaFirstvisit = 0 and meet_after_school = 1: gs 'show_table', '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a>', '5'
 			if LariskaHomeIn > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>', '5'
-			if JuliaMilLernQW >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milov</a>', '5'
+			if JuliaMilLernQW >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a>', '5'
 			if NatbelQW['QWstage'] > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>', '5'
-			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0: gs 'show_table', '<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a>', '5'
+			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a>', '5'
+			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5: gs 'show_table', '<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>', '5'
 			if katjaMeynoldday ! daystart and meynoldQW >= 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>', '5'
 			if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
 				gs 'show_table', '<a href="exec:minut += 15 & gt ''dimaHome'', ''home''">Dimka Nosov</a>', '5'
@@ -291,12 +292,11 @@ if $ARGS[0] = 'main':
 			elseif fedorKozlovQW >= 10:
 				gs 'show_table', '<a href="exec: gt ''FedorEv'', ''Start''">Fedor</a>', '5'
 			end
-			if NikoVolkovQW = 5 and NikoDate = 1 and NikoDate_Day ! daystart or NikoEv = 11 and NikoDate_Day ! daystart:
+			if NikoVolkovQW = 5 and NikoDate = 1 and NikoDate_Day ! daystart or NikoEv = 11:
 				gs 'show_table', '<a href="exec: gt ''NikoEv'', ''Niko Dates''">Nikolai</a>', '5'
 			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
 				gs 'show_table', '<a href="exec: gt ''NikoEv2'', ''Events''">Nikolai</a>', '5'
 			end
-			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5: gs 'show_table', '<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>', '5'
 			if st_count > 0:
 				'Near school yard, you see: '
 				'<TABLE BORDER=1><<$show_table>></TR></TABLE>'

locations/pav_complex.qsrc

@@ -100,21 +100,21 @@ if $ARGS[0] = 'start':
 		if (npc_rel['A112'] >=70) or (npc_rel['A112'] >=30 and week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (week < 6 and hour >= 14 and hour <= 23) or (hour >= 0 and hour < 2):
 			gs'show_table','Apartment of Uncle <a href="exec:minut += 15 & gt ''shulgahome''" >Shulgin</a>.','3'
 		else
-			gs'show_table','Apartment of Uncle Shulgin..','3'
+			gs'show_table','Apartment of Uncle Shulgin.','3'
 		end
 		if ArtemBeInHome > 0 and artemblok = 0:gs'show_table','Apartment of <a href="exec:minut += 15 & gt ''artemhome'', ''home''">Artem Chebotarev</a>.','3'
 		if BeInJulMilHome = 1:
 			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
-				gs'show_table','apartment of <a href="exec:minut += 15 & gt ''JuliaMilHome''">Julia Milova</a>.','3'
+				gs'show_table','Apartment of <a href="exec:minut += 15 & gt ''JuliaMilHome''">Julia Milova</a>.','3'
 			else
-				gs'show_table','apartment of Julia Milova..','3'
+				gs'show_table','Apartment of Julia Milova.','3'
 			end
 		end
 		if NatbelQW['VisitedHome'] = 1:
 			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
-				gs'show_table','apartment of <a href="exec:minut += 15 & gt ''natbelapt'', ''home''">Natasha Belova</a>.','3'
+				gs'show_table','Apartment of <a href="exec:minut += 15 & gt ''natbelapt'', ''home''">Natasha Belova</a>.','3'
 			else
-				gs'show_table','apartment of Natasha Belova.','3'
+				gs'show_table','Apartment of Natasha Belova.','3'
 			end
 		end
 		if anushkaFirstvisit ! 0: gs'show_table','Messy home of <a href="exec:minut += 10 & gt ''anushapt'', ''home''">Anushka Konstantinov</a>.','3'

locations/pav_residential.qsrc

@@ -132,7 +132,7 @@ else
 	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''dimaHome'', ''home''">Dimka Nosov</a>','3'
 	if IgorLoverQW > 0 and IdorBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
 	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: gs'show_table','House of the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a>','3'
-	if LariskaHomeIn > 0:gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome''" >Lariska Gruzdevaya</a>, in richer part','3'
+	if LariskaHomeIn > 0:gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome''" >Lariska Gruzdev</a> in the richer part of town','3'
 	if AlbinaQW['KnowsHouse'] > 0 or AlbinaQW['StarletsJoined'] = 1:gs'show_table','Luxurious mansion of <a href="exec:minut += 10 & gt ''albinaporog''">Albina Barlovskaya</a>','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end