Proofreading city files

locations/city_center.qsrc

@@ -11,12 +11,12 @@ $location_type = 'public_outdoors'
 killvar '$locclass'
 CLOSE ALL
 if sound = 0:
-	if month >=11 and month <= 12 or month >=1 and month <=3:
-		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+	if month >= 11 and month <= 12 or month >=1 and month <= 3:
+		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3', 30
 	else
-		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 	end
 end
 
@@ -25,7 +25,7 @@ bankloc = 1
 gs 'stat'
 
 !call random events from [street_events], and display them before show location.
-if streetevent_hour ! hour:gt 'street_event','city_center', 'main'
+if streetevent_hour ! hour: gt 'street_event','city_center', 'main'
 
 '<center><h2>St. Petersburg</h2></center>'
 '<center><b>City Center</b></center>'
@@ -44,10 +44,10 @@ else
 end
 *nl
 
-'Day or night, the city centre is alive and bustling. So whether you''re looking to shop, hit the gym or get some cheap food, you''ll find it hard not to have your needs satisfied.'
+'Day or night, the city center is alive and bustling, so whether you''re looking to shop, hit the gym or get some cheap food, you''ll find it hard not to have your needs satisfied.'
 *nl
 
-gs'street_event','city_center', 'extras'
+gs 'street_event','city_center', 'extras'
 
 if nichWork = 2:act '<b>GO HOME</b> (Nicholas'' apartment)':gt 'nichApartment'
 
@@ -73,15 +73,16 @@ if shantpopala > 0:
 	rape += 1
 	shantpopala -= 1
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/sex/rape.jpg"></center>'
-	'A black jeep suddenly hit the brakes on the street close to you. You turn your head to see what''s happening and see two prominent men jump out of it and start running towards you. Before you can react and run away, they grab you and drag you into the car.'
-	'"You''re doing this for a living? Taking pictures of naked people in the park?" one of them shouts while holding one of the pictures to your face you''ve made a while back and sent someone over a social network, hoping they would pay the ransom.'
-	'"No... what? What the hell is going on? I don''t know what you''re talking about!" you try to explain.'
-	'"Don''t lie to us, you stupid bitch." as he says that, he hits you on your head, and you pass out.'
-	'You wake up somewhere out of town, tied up and naked. You look down on yourself and notice traces of cum on your body. It also seems like that cum is flowing from your ass and pussy.'
-	'You notice that the blokes, who captured you, sit next to you and seem to have a break. Some of them are smoking.'
-	'"Oh, she is finally awake, then the next fuck-cycle will be far more fun.", one of the men said as he noticed you moving. Some of them are starting to get evil grins on their face.'
-	'They got up and came back at you. Barely a minute later, you wished you were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded black, and you lost consciousness again.'
-	'You feel groggy as you wake up, but someone grabs you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he yells, then kicks you in the stomach and leaves. As you collapse on the ground holding your stomach in pain, you glimpse the street and see the assholes driving away in their black jeep. The main road is about 200m away. You crawl most of the way there, but soon you can walk again, and eventually, you find your way back to one of the main streets.'
+	'A black jeep suddenly hit the brakes on the street close to you. You turn your head to see what''s happening and see two prominent men jump out of it and start running towards you. Before you can react, they grab you and drag you into the car.'
+	'"You''re doing this for a living? Taking pictures of naked people in the park?" one of them shouts while holding up one of the pictures you took and sent someone over a social network, hoping they would pay the ransom.'
+	'"No? What the hell is going on? I don''t know what you''re talking about!" you try to explain.'
+	'"Don''t lie to us, you stupid bitch!" he snarls before he hits you on the head and you pass out.'
+	*nl
+	'You wake up somewhere, tied up and naked. You look down and notice traces of cum on your body. You can also feel cum flowing from your ass and pussy.'
+	'You notice that the men who captured you are sitting next to you having a break. Some of them are smoking.'
+	'"Oh, she''s finally awake. The next fuck-cycle will be far more fun," one of the men says when he notices you moving.'
+	'They all get up and walk towards you before having their way with you. You try to resist, but the tape hinders you from moving. Not long after, everything fades black and you lose consciousness again.'
+	'You feel groggy as you wake up, but someone grabs you by the hair and shouts at you. "Let this be a lesson for you, bitch!" he yells before kicking you in the stomach. As you hold your stomach in pain, you glimpse the men driving away in their black jeep. You crawl to the main road and find your way back to one of the main streets.'
 	gs 'arousal', 'bj', -60, 'sub', 'gangbang','humiliation', 'rough'
 	gs 'arousal', 'vaginal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
 	gs 'arousal', 'anal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
@@ -96,75 +97,74 @@ end
 gs 'music_actions', 'music_icon'
 
 
-if car > 0 and cardrive = 2:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
+if car > 0 and cardrive = 2:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> sits in the parking lot.'
 
 act 'Walk to the central park (0:35)': minut += 35 & gt 'city_park', 'start'
 act 'Walk to the train station (0:05)': minut += 5 & gt 'city_train', 'start'
-if hour = 4 and hour = 23:
-	act 'Walk to the Metro':  minut += 5 & gt 'metro', 'start'
+if hour >= 4 and hour < 23:
+	act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 end
 
-
-act 'Wait':gs 'obj_din', 'wait'
+act 'Wait': gs 'obj_din', 'wait'
 
 gs 'taxi'
 
-if hour >= 4 and hour <= 23:
+if hour >= 4 and hour < 23:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''metro'', ''start''">the metro</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 4:00''">the metro</a>'
+	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 04:00''">the metro</a>'
 end
 
-'You have easy access to the <a href="exec: minut += 5 & gs ''city_train'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St. Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a 35 minute walk from here and provides a more scenic route to the other city districts.'
+'You have easy access to the <a href="exec: minut += 5 & gs ''city_train'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St. Petersburg and the subway is great if you''re tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a 35 minute walk from here and provides a more scenic route to the other city districts.'
 *nl
-if hour >= 8 and hour <= 22:
+if hour >= 8 and hour < 22:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''kiosk'', ''start''">kiosk</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The Ruch kiosk is closed and will reopen at 8:00''">kiosk</a>'
+	$desc_txt1 = '<a href="exec:msg ''The Ruch kiosk is closed and will reopen at 08:00''">kiosk</a>'
 end
-'The neon green sign of a <<$desc_txt1>> catches your eye. It''s open 8-10 selling magazines and cigarettes for cheap.'
+'The neon green sign of a <<$desc_txt1>> catches your eye. It''s open between 08:00 and 22:00 and sells cheap magazines and cigarettes.'
 *nl
 if hour = 8 and minut >= 30:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''torgcentr''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
+	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 09:00''">Havana Fitness Center</a>'
 elseif hour >= 9 and hour <= 20:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''torgcentr''">The Galeria mall</a>'
 	$desc_txt2 = '<a href="exec:gt ''fit'', ''start''">Havana Fitness Center</a>'
 else
 	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at 8:30''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
+	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 09:00''">Havana Fitness Center</a>'
 end
 '<<$desc_txt1>> is front and center in the commercial area. Nearby is a <<$desc_txt2>> which has a swimming pool that can be used for a small fee.'
 if hour >= 6 and hour <= 23:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''foto'', ''start''">Aphrodite Photography</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Aphrodite Photography is closed and will reopen at 6:00''">Aphrodite Photography</a>'
+	$desc_txt1 = '<a href="exec:msg ''Aphrodite Photography is closed and will reopen at 06:00''">Aphrodite Photography</a>'
 end
 if hour >= 6 and hour <= 23:
 	$desc_txt2 = '<a href="exec: minut += 1 & gt ''burger'', ''start''">Diner Bystroeshka</a>'
 else
-	$desc_txt2 = '<a href="exec:msg ''Diner Bystroeshka is closed and will reopen at 6:00''">Diner Bystroeshka</a>'
+	$desc_txt2 = '<a href="exec:msg ''Diner Bystroeshka is closed and will reopen at 06:00''">Diner Bystroeshka</a>'
 end
 if hour >= 8 and hour <= 22:
 	$desc_txt3 = '<a href="exec:gt ''restoran'', ''start''">Babel</a>'
 else
-	$desc_txt3 = '<a href="exec:msg ''Babel is closed and will reopen at 8:00''">Babel</a>'
+	$desc_txt3 = '<a href="exec:msg ''Babel is closed and will reopen at 08:00''">Babel</a>'
 end
-'A few buildings away is <<$desc_txt1>> and <<$desc_txt2>>, a place for cheap fast food. For a more lavish dining experience, <<$desc_txt3>> is available.'
+'A few buildings away is <<$desc_txt1>> and <<$desc_txt2>>, a place that sells cheap fast food. For a more lavish dining experience, <<$desc_txt3>> is available.'
 *nl
 if week >= 4 and (hour >= 18 or hour <= 3):
 	$desc_txt3 = '<a href="exec:gt ''city_nightclub'', ''start''">the nightclub</a>'
 else
 	$desc_txt3 = '<a href="exec:msg ''The nightclub is closed and will open from Friday to Sunday at 18:00''">The nightclub</a>'
 end
-'At night the only place open here is <<$desc_txt3>>.'
+'The only place open here at night is <<$desc_txt3>>.'
 *nl
 if (week < 6 and hour >= 8 and hour <= 16) or (week = 6 and hour >= 8 and hour <= 13):
 	$desc_txt1 = '<a href="exec:gt ''office'', ''start''">Titran-Express</a>'
 elseif (week = 5 or week = 6) and hour > 16:
-	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 8:00 on Monday''">Titran-Express</a>'
+	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 08:00 on Monday''">Titran-Express</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 8:00''">Titran-Express</a>'
+	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 08:00''">Titran-Express</a>'
 end
 'Across the street is considered the business area. The large skyscraper there serves as the base of operations for <<$desc_txt1>>, an engineering company.'
 *nl
@@ -173,40 +173,40 @@ if casting = 0:
 elseif hour >= 7 and hour <= 20:
 	$desc_txt1 = '<a href="exec:gt ''talent_agency'', ''start''">Aurora talent agency</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Aurora talent agency is closed and will reopen at 7:00''">Aurora talent agency</a>'
+	$desc_txt1 = '<a href="exec:msg ''Aurora talent agency is closed and will reopen at 07:00''">Aurora talent agency</a>'
 end
 if week < 6 and hour >= 9 and hour <= 18:
 	$desc_txt2 = '<a href="exec:gt ''bank'', ''start''">VTB bank</a>'
 elseif week < 5 and hour > 18:
-	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen tomorrow at 9:00''">VTB bank</a>'
+	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen tomorrow at 09:00''">VTB bank</a>'
 else
-	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen on monday at 9:00''">VTB bank</a>'
+	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen on monday at 09:00''">VTB bank</a>'
 end
 if hour >= 8 and hour <= 22:
 	$desc_txt3 = '<a href="exec: minut += 1 & gt ''agentned'', ''start''">Kirsanova Realty</a>'
 else
-	$desc_txt3 = '<a href="exec:msg ''Kirsanova Realty is closed and will reopen at 8:00''">Kirsanova Realty</a>'
+	$desc_txt3 = '<a href="exec:msg ''Kirsanova Realty is closed and will reopen at 08:00''">Kirsanova Realty</a>'
 end
 if (week < 6 and hour >= 9 and hour <= 16) or (week = 6 and hour >= 9 and hour <= 13):
 	$desc_txt4 = '<a href="exec: minut += 3 & gt ''post_office'', ''start''">post office</a>'
 elseif (week = 5 or week = 6) and hour > 16:
-	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 9:00 on Monday''">post office</a>'
+	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 09:00 on Monday''">post office</a>'
 else
-	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 9:00''">post office</a>'
+	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 09:00''">post office</a>'
 end
 if hour >= 8 and hour <= 18:
 	$desc_txt5 = '<a href="exec: minut += 1 & gt ''city_library''">National Library of Russia</a>'
 else
-	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 8:00''">National Library of Russia</a>'
+	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 08:00''">National Library of Russia</a>'
 end
-'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>> and <<$desc_txt3>> and the 5-star <a href="exec: minut += 1 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
+'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>>, <<$desc_txt3>> and the 5-star <a href="exec: minut += 1 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
 *nl
 if week < 6 and hour >= 7 and hour <= 17:
 	$desc_txt6 = '<a href="exec: minut += 1 & gt ''sentence'',''start''">The City Courthouse</a>'
 elseif week < 5 and hour > 17:
-	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen tomorrow at 7:00''">City Courthouse</a>'
+	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen tomorrow at 07:00''">City Courthouse</a>'
 else
-	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen on Monday at 7:00''">City Courthouse</a>'
+	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen on Monday at 07:00''">City Courthouse</a>'
 end
 $desc_txt7 = '<a href="exec: minut += 1 & gt ''police_station'',''start''">Main city police station</a>'
 'Away from the shops is both <<$desc_txt6>> and the <<$desc_txt7>>.'
@@ -215,9 +215,9 @@ $desc_txt7 = '<a href="exec: minut += 1 & gt ''police_station'',''start''">Main
 *nl
 if nichHotelReferral = 2:
 	if hour >= 4 and hour < 16:
-		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid. But it is too early for that. You should come back between 16:00 and 20:59.'
-	elseif hour < 4 or hour > 20:
-		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid. But it is too late for that. You should come back between 16:00 and 20:59.'
+		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid, but it''s too early for that. You should come back between 16:00 and 21:00.'
+	elseif hour < 4 or hour > 21:
+		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid, but it''s too late for that. You should come back between 16:00 and 21:00.'
 	else
 		'You could go to the <a href="exec:gt ''nichApartment'', ''jobInterview''">apartment of a man named Nicholas</a> to apply for a job as a live-in maid.'
 	end
@@ -230,21 +230,21 @@ if Enable_tablemap = 0:
 	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.'
-	if peter > 0:'<a href="exec:gt ''peterroom'', ''start_door''">Peter</a> the sexshop owner''s apartment.'
+	if peter > 0:'<a href="exec:gt ''peterroom'', ''start_door''">Peter</a> the sex shop owner''s apartment.'
 else
 	st_count=0 & $show_table=''
-	if nichTanya['Relationship'] = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanya['FuckLast'] ! 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''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''">Yaroslav''s</a> apartment','3'
-	if peter > 0:gs'show_table','<a href="exec:gt ''peterroom'', ''start_door''">Peter''s</a> apartment','3'
+	if nichTanya['Relationship'] = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanya['FuckLast'] ! 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''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''">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
 
-if AlexandriaQW = 3 and hour >= 6 and hour <= 23:
+if AlexandriaQW = 3 and hour >= 6 and hour < 23:
     *nl
-    act 'Call Tatiana to infiltrate the models agency': gt 'tatiana_missions','mission2B'
+    act 'Call Tatiana to infiltrate the modeling agency': gt 'tatiana_missions','mission2B'
 end
 
 if hour >= 20 or hour <= 4:

locations/city_coffee_hole.qsrc

@@ -5,7 +5,7 @@
 
 $location_type = 'public_indoors'
 
-if $args[0]= 'start':
+if $ARGS[0]= 'start':
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'start'
 	menu_off = 0
@@ -13,10 +13,10 @@ if $args[0]= 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/street_sign.jpg"></center>'
 	'Along the street is a sign advertising a cafe called the "Coffee Hole". Following the direction of the sign, you find the door to the cafe in a little nook between two buildings. It would have been hard to see from the street without the sign. Opening hours are 07:00 to 23:00.'
 	act 'Return to the city': gt 'city_island'
-	if hour >= 7 and hour < 23: act 'Enter the cafe': gt 'city_coffee_hole', 'inner'
+	if hour >= 7 and hour < 22: act 'Enter the cafe': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0]= 'inner':
+if $ARGS[0]= 'inner':
 	$loc = 'city_coffee_hole'
 	$loc_arg = 'inner'
 	$menu_loc = 'city_coffee_hole'
@@ -37,7 +37,7 @@ if $args[0]= 'inner':
 		'You see your classmate <a href="exec:gt ''katja_chat'', ''coffee_hole''">Katja</a> sitting at a table with a pile of books, a cup of coffee and a plate of food.'
 	end
 	!!if locat['albina'] = 17 and AlbinaQW['know_albina_uni'] > 0 or mid($start_type,1,2) = 'sg'):
-		!!'You see <a href="exec:gt ''albina_uni'', ''coffee_hole''">Albina</a> sitting at a table with a woman who has her back turned to you.'
+		!!'You see <a href="exec:gt ''city_coffee_hole'', ''albina''">Albina</a> sitting at a table with a woman who has her back turned to you.'
 	!!end
 	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and day = 2 and nerd_game['fixed_uni_day'] = 0 and hour >= 18:
 		'You see some familiar faces sitting in one of the corners. Some of the <a href="exec:gt ''nerd_game_night'', ''crash_gamenight_uni''">nerds</a> you went to school with back in Pavlovsk are gathered around a table. It looks like they''re playing some sort of game.'
@@ -149,7 +149,7 @@ if $args[0]= 'counter':
 	minut += 5
 	gs 'stat'
 	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)):
-			gt 'city_coffee_hole','anushka_work'
+		gt 'city_coffee_hole','anushka_work'
 	else 
 		temprand = rand(1,2)
 		if temprand = 1:
@@ -158,7 +158,7 @@ if $args[0]= 'counter':
 			'As you approach, the woman behind the counter looks up at you. She appears to be in her late twenties or maybe early thirties. She has dark hair with purple streaks, and her arms are covered in tattoos. "Welcome to the Coffee Hole. What can I get you?" she asks in a friendly and welcoming tone. You notice she has a familiar accent; it reminds you a little bit of Marcus'' accent.'
 			act 'Exit the cafe': gt 'city_island'
 			act 'Leave counter': gt 'city_coffee_hole', 'inner'
-			act 'Order from the menu (0:05)':gs 'food_menu'
+			act 'Order from the menu (0:05)': gs 'food_menu'
 		else
 			'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/worker2.jpg"></center>'
@@ -184,15 +184,15 @@ if $args[0]= 'anushka_work':
 		if npc_rel['A144'] >= 60:
 			'As you approach the counter, you see your classmate Anushka working again. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole. Need your holes filled with something hot and black again?" she says with a wink, even making ordering coffee sound dirty.'
 			'You smile at her. "You are so bad."'
-!!make sure I didn't forget a end
+
 			if anushkaCityQW['first_visit'] = 0:
 				anushkaCityQW['first_visit'] = 1
-				'"Hey I have been meaning to ask, which dorm are you in? Maybe I can stop by and visit some time." You ask her.'
-				'She shakes her head. "I''m not, got a apartment with the boys." She shrugs a bit about it. "Yeah it is as bad as you think, but you can stop by sometime if you want." She gives you her address.'
-			'You chat about the university before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+				'"Hey, I''ve been meaning to ask. Which dorm are you in? Maybe I can stop by and visit some time?" you ask.'
+				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."' 
+				'She gives you her address and you chat about the university before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 			if anushkaQW['photoshoot'] >= 1 and hour = 22:
-				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chat about the university and her job. After talking for a bit, you notice that it''s close to closing, and the place is almost empty. Maybe she would be up for a little after-hours photo shoot for you?'
+				'She shrugs. "And you love it. It''s why you love hanging out with me." You end up chatting about the university and her job for a while before you notice that it''s close to closing, and the place is almost empty. Maybe she would be up for a little after-hours photo shoot for you?'
 				act 'Let''s do a photo shoot':
 					*clr & cla
 					'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
@@ -200,11 +200,11 @@ if $args[0]= 'anushka_work':
 					'You grin at her. "We should totally do a photo shoot here."'
 					'She gives you a slightly surprised look. "What? Now?"'
 					'You find her reaction amusing. "Well, we could, but I was thinking after you closed up. So what do you say?"'
-					'She bites her lower lip for a moment. "Fuck, okay, why not? Just hang around until I close up."'
+					'She bites her lower lip. "Fuck. Okay, why not? Just hang around until I close up."'
 					act 'Wait': gt 'city_coffee_hole', 'photo_shoot'
 				end
 			else
-				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chat about the university and her job before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+				'She shrugs. "And you love it. It''s why you love hanging out with me." You chat about the university and her job before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 		elseif npc_rel['A144'] <= 20:
 			'As you approach the counter, you see your classmate Anushka working again. When she sees you, she sighs, and you think she rolls her eyes. "Welcome to the Coffee Hole. What can I get you?"'
@@ -221,12 +221,12 @@ if $args[0]= 'anushka_work':
 			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole, where we can fill your holes with something hot and black, but maybe not in the way you would like..." she says with a wink, even making ordering coffee sound dirty.'
 			'You smile at her. "Oh my god, you''re terrible. I didn''t know you worked here."'
 			'She shrugs. "I need some extra money coming in to help pay for stuff. This is pretty easy, close to my place, and I can study when it''s slow."'
-!!make sure I didn't forget a end
+
 			if anushkaCityQW['first_visit'] = 0:
 				anushkaCityQW['first_visit'] = 1
-				'"Nice, which dorm are you in? Maybe I can stop by and visit some time." You ask her.'
-				'She shakes her head. "I''m not, got a apartment with the boys." She shrugs a bit about it. "Yeah it is as bad as you think, but you can stop by sometime if you want." She gives you her address.'
-			'You chat about the university before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+				'"Nice. Which dorm are you in by the way? Maybe I can stop by and visit some time?" you ask.'
+				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."' 
+				'She gives you her address and you chat about the university before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 		elseif npc_rel['A144'] <= 20:
 			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she sighs, and you think she rolls her eyes. "Welcome to the Coffee Hole. What can I get you?"'
@@ -350,7 +350,7 @@ if $ARGS[0] = 'photo_shoot':
 	end
 end
 
-if $args[0]= 'lazar':
+if $ARGS[0]= 'lazar':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'lazar'
@@ -367,17 +367,17 @@ if $args[0]= 'lazar':
 		if npc_rel['A149'] >= 60:
 			lazarQW['city_invite'] = 1
 			if hotcat >= 6:
-				'You notice Lazar sitting at a table. As you approach, he says "What''s up, hottie? You enjoying the city?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime. We would love to have you over." He tells you where they live before he heads outside and walks away.'
+				'You notice Lazar sitting at a table. "What''s up, hottie? You enjoying the city?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime. We would love to have you over." He tells you where they live before he heads outside and walks away.'
 			else
-				'You notice Lazar sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
+				'You notice Lazar sitting at a table. "Hey <<$pcs_nickname>>, how have you been?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
 			end
 		elseif npc_rel['A149'] <= 20:
 			'You notice Lazar sitting at a table. As you approach, all he says is "Hey." You sit and talk to him for a few minutes, but he doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." He heads outside and walks away.'
 		else
 			if hotcat >= 6:
-				'You notice Lazar sitting at a table. As you approach, he says "Hey, good looking. What have you been up to?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going. Give me your number, and I''ll give you a call sometime. We can go out and have some fun or something sometime." You exchange phone numbers with him before he heads outside and walks away.'
+				'You notice Lazar sitting at a table. "Hey, good looking. What have you been up to?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going. Give me your number, and I''ll give you a call sometime. We can go out and have some fun or something sometime." You exchange phone numbers with him before he heads outside and walks away.'
 			else
-				'You notice Lazar sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going, but it was nice catching up. Maybe I''ll see you around sometime?" he says before heading outside and walking away.'
+				'You notice Lazar sitting at a table. "Hey <<$pcs_nickname>>, how have you been?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going, but it was nice catching up. Maybe I''ll see you around sometime?" he says before heading outside and walking away.'
 			end
 		end
 	end
@@ -385,7 +385,7 @@ if $args[0]= 'lazar':
 	act 'Leave him be': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0]= 'dimka':
+if $ARGS[0]= 'dimka':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'dimka'
@@ -400,17 +400,17 @@ if $args[0]= 'dimka':
 	else
 		if npc_rel['A1'] >= 60:
 			if grupTipe = 1:
-				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. It seems spending some time around me did you good. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as always." You sit and talk to him for a few minutes. He is relatively nice to you, even asking about what you''ve been up to until he finishes his drink. "I know you love thinking this is like the old days when we could hang out all the time, but now things are different. Maybe I''ll see you around, and if you''re good, I''ll introduce you to the cool crowd at the uni," he says in a haughty tone, as if he''s already the King of the university. He then stands and walks away.'
+				'You notice Dimka sitting at a table. He smiles as you approach. "Well well, look who it is. It seems spending some time around me did you good. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as always." You sit and talk to him for a few minutes and he''s relatively nice to you, even asking about what you''ve been up to until he finishes his drink. "I know you love thinking this is like the old days when we could hang out all the time, but now things are different. Maybe I''ll see you around, and if you''re good, I''ll introduce you to the cool crowd at the uni," he says in a haughty tone, as if he''s already the King of the university. He then stands and walks away.'
 			else
-				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as usual." You sit and talk to him for a few minutes, but all he does is give you back-handed compliments until he finishes his drink. "I know you love being seen with me, but I have better things to do. Maybe I''ll see you around?" he says before getting up and walking away.'
+				'You notice Dimka sitting at a table. He smiles as you approach. "Well well, look who it is. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as usual." You sit and talk to him for a few minutes, but all he does is give you back-handed compliments until he finishes his drink. "I know you love being seen with me, but I have better things to do. Maybe I''ll see you around?" he says before getting up and walking away.'
 			end
 		elseif npc_rel['A1'] <= 20:
-			'You notice Dimka sitting at a table. As you approach, he says "What the fuck do you want, loser? Never mind, I don''t want to know. Just go away." He starts ignoring you, so you turn and walk away.'
+			'You notice Dimka sitting at a table. He scowls as you approach. "What the fuck do you want, loser? Never mind, I don''t want to know. Just go away." He starts ignoring you, so you turn and walk away.'
 		else
 			if grupTipe = 1:
-				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. It seems spending some time around on me did you good. You managed to make it out of Pavlovsk before you got knocked up  by some loser." You sit down and talk to him for a few minutes, but all he does is make snide remarks until he finishes his drink. "I know you love being seen with me, but we''re not in Pavlovsk anymore and no longer run in the same social circles." He gets up and walks away, leaving you alone in the cafe.'
+				'You notice Dimka sitting at a table. He smiles as you approach. "Well well, look who it is. It seems spending some time around on me did you good. You managed to make it out of Pavlovsk before you got knocked up  by some loser." You sit down and talk to him for a few minutes, but all he does is make snide remarks until he finishes his drink. "I know you love being seen with me, but we''re not in Pavlovsk anymore and no longer run in the same social circles." He gets up and walks away, leaving you alone in the cafe.'
 			else
-				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. I honestly never thought you would make it out of Pavlovsk. I figured you would be knocked up and married to some loser by now." You sit and talk to him for a few minutes, but all he does is berate you until he finishes his drink. "I know you love being seen with me, but I have better things to do." he says before getting up and walking away.'
+				'You notice Dimka sitting at a table. He smiles as you approach. "Well well, look who it is. I honestly never thought you would make it out of Pavlovsk. I figured you would be knocked up and married to some loser by now." You sit and talk to him for a few minutes, but all he does is berate you until he finishes his drink. "I know you love being seen with me, but I have better things to do," he says before getting up and walking away.'
 			end
 		end
 	end
@@ -418,7 +418,7 @@ if $args[0]= 'dimka':
 	act 'Leave him be': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0] = 'marcus':
+if $ARGS[0] = 'marcus':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'marcus'
@@ -434,18 +434,18 @@ if $args[0] = 'marcus':
 	else
 		if npc_rel['A146'] >= 50:
 			marcusQW['city_invite'] = 1
-			'You notice Marcus sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
+			'You notice Marcus sitting at a table. He smiles as you approach. "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
 		elseif npc_rel['A146'] <= 20:
-			'You notice Marcus sitting at a table. As you approach, he says "Hey." You sit down and talk to him for a few minutes. He doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." After that, he walks outside and walks away.'
+			'You notice Marcus sitting at a table. As you approach, all he says is "Hey." You sit and talk to him for a few minutes, but he doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." After that, he walks outside and walks away.'
 		else
-			'You notice Marcus sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. It was nice catching up. Maybe I''ll see you around?" he asks before he heads outside and walks away.'
+			'You notice Marcus sitting at a table. "Hey <<$pcs_nickname>>, how have you been?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. It was nice catching up. Maybe I''ll see you around?" he asks before he heads outside and walks away.'
 		end
 	end
 	act 'Exit the cafe': gt 'city_island'
 	act 'Leave him be': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0]= 'kendra':
+if $ARGS[0]= 'kendra':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'kendra'
@@ -455,7 +455,7 @@ if $args[0]= 'kendra':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 	if meet_kendra = 1:
-		'As you walk  over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you "You change your mind about serving me?"'
+		'As you walk  over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat. "You change your mind about serving me?" she asks bluntly.'
 		act 'No':
 			*clr & cla
 			kendrano = 1
@@ -479,9 +479,9 @@ if $args[0]= 'kendra':
 		end
 	elseif kendraslave >= 1:
 		gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
-		'As you walk over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you, "Who do we have here? My favourite little white bitch. Come to service me? I wish I had time for a training session, but unfortunately, I have things to do. Come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
+		'As you walk over to her, she invites you to sit down. "Who do we have here? My favourite little white bitch. Come to service me? I wish I had time for a training session, but unfortunately, I have things to do. Come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
 	elseif hotcat >= 5:
-		'As you walk over to her, she invites you to sit down. You take a seat opposite her as she says. "You''re a pretty little thing. What''s your name?"'
+		'As you walk over to her, she invites you to sit down and you take a seat opposite her. "You''re a pretty little thing. What''s your name?" she asks.'
 		'"<<$pcs_firstname>>, but most people call me <<$pcs_nickname>>. What''s your name?" you reply.'
 		'She smiles. "<<$pcs_nickname>>, what a pretty name. I''m Kendra, but you can call me Mistress Kendra," she says confidently.'
 		'"Oh..." you reply. She''s one of those people.'
@@ -493,9 +493,9 @@ if $args[0]= 'kendra':
 			npc_rel['A84'] = 45
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
-			  'You start talking with her. You tell her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo who attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
+			  'You start talking with her, telling her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo who attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			else
-			  'You start talking with her. You tell her a bit about yourself, and she replies by saying that she''s a student from the Republic of Congo attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
+			  'You start talking with her and tell her a bit about yourself, and she replies by saying that she''s a student from the Republic of Congo attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			end
 			act 'Call her Kendra':
 				*clr & cla
@@ -521,14 +521,14 @@ if $args[0]= 'kendra':
 		end
 	elseif npc_rel['A84'] < 40:
 		gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
-		'You walk over to her table and stand next to it. "Hi," you smile at her as you greet her.'
+		'You walk over to her table and stand next to it. "Hi," you smile as you greet her.'
 		'She looks up at you with an annoyed look. "I don''t have time for games, and I''m tired of yours. Now get lost." She proceeds to ignore you, so you turn and leave.'
 	end
 	act 'Exit the cafe': gt 'city_island'
 	act 'Leave her be': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0]= 'djibril':
+if $ARGS[0]= 'djibril':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'djibril'
@@ -541,24 +541,28 @@ if $args[0]= 'djibril':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 	if DjibrilQW['invite'] = 1:
-		'You notice Djibril sitting at a table. As you approach, he says "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'	
+		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'	
 	elseif DjibrilQW['meet'] = 1 and DjibrilQW['invite'] = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/djibril_talk.jpg"></center>'
-		'You notice Djibril sitting at a table. As you approach, he says "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
+		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
 		
 	elseif hotcat >= 5:
 		DjibrilQW['meet'] = 1
 		'As you approach him, the young African man sitting at the table introduces himself. "I am Djibril Maina. What''s your name?"'
 		'You smile at him. "<<$pcs_firstname>> <<$pcs_lastname>>, but most people just call me <<$pcs_nickname>>."'
-		'He looks surprised for a moment. "Are you from Pavlovsk?" When you nod your head, he looks even more surprised. "Do you have an Aunt Luda dating a man named Olu?"'
+		'He looks surprised for a second. "Are you from Pavlovsk?" When you nod your head, he looks even more surprised. "Do you have an Aunt Luda dating a man named Olu?"'
 		'Now it''s your turn to look surprised. "Yes, how did you know that?"'
 		*nl
 		'He shakes his head with a slight laugh. "He is my uncle. They''ve told me about you. Small world, huh?"'
-		'You giggle as well. "Yeah, it really is."'
+		'You giggle. "Yeah, it really is."'
 		'You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
 	end
 	act 'Exit the cafe': gt 'city_island'
 	act 'Leave him be': gt 'city_coffee_hole', 'inner'
 end
 
+!!if $ARGS[0] = 'albina'
+!!!!!!!!!!!!!!!!!!!!!!!!
+end
+
 --- city_coffee_hole ---------------------------------

locations/city_industrial.qsrc

@@ -9,12 +9,12 @@ if $ARGS[0] = '':
 	menu_off = 0
 	CLOSE ALL
 	if sound = 0:
-		if month >=11 and month <= 12 or month >=1 and month <=3:
-			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+		if month >= 11 and month <= 12 or month >= 1 and month <= 3:
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3', 30 & PLAY 'sound/zima.mp3', 30
 		else
-			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 		end
 	end
 
@@ -39,13 +39,13 @@ if $ARGS[0] = '':
 		end
 	end
 
-	gs'street_event','city_industrial', 'extras'
+	gs 'street_event','city_industrial', 'extras'
 
 	act 'Walk to the main road to Pavlovsk (0:15)': minut += 15 & nroad = 0 & gt'road'
 	act 'Walk to the Red Light District (0:05)': minut += 5 & gt 'city_redlight', 'start'
 	act 'Walk to the central park (1:00)': minut += 60 & gt 'city_park', 'start'
 	act 'Walk to the industrial train station (0:15)': minut += 15 & gt 'city_industrial_train', 'outside'
-	if hour >= 4 and hour <= 23:
+	if hour >= 4 and hour < 23:
 		act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 	end
 	if evt_chk = 1:
@@ -63,7 +63,7 @@ if $ARGS[0] = '':
 			cardrive = 3
 		end
 		if cardrive = 3 or cardrive = 6 or (cardrive = 7 and func('autoservisF', 'is_open')) or (cardrive = 9 and func('autotraidF', 'is_open')) or cardrive = 27:
-			'In the parking stands your <a href="exec:' + iif(cardrive = 3, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a>.'
+			'Your <a href="exec:' + iif(cardrive = 3, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a> stands in the parking lot.'
 		end
 	end
 
@@ -78,19 +78,19 @@ if $ARGS[0] = '':
 	'At the center of the industrial region is a <a href="exec:minut += 15 & gt ''city_industrial_train'', ''outside''">train station</a>.'
 
 	if week = 3 or hour < 16:
-		'The "Rabotnik" bar is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and midnight...'
+		'The "Rabotnik" bar is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and midnight.'
 	else
 		'The <a href="exec: minut += 5 & gt ''qwBarPolet''">Bar "Rabotnik"</a> seems to be open.'
 	end
 	![slavaQW - Related to Glory; references to bar "Flight" have to be fixed - requirement to access the bar has been removed for now, since content not related - Variable not used by anything else at the moment]
 
 	litltown = 0
-	'There is a <a href="exec: minut += 5 & gt ''zaprF'', ''start''">gas station</a> near the street'
+	'There is a <a href="exec: minut += 5 & gt ''zaprF'', ''start''">gas station</a> near the street.'
 
-	if hour >= 5 and hour <= 23:
+	if hour >= 4 and hour < 23:
 		'The <a href="exec: minut += 5 & gt ''metro'', ''start''">metro station</a> is within a 5 minute walk from here.'
 	else
-		'The metro station is within a 5 minute walk from here. The metro system is closed between midnight and 05:00.'
+		'The metro station is within a 5 minute walk from here, but it''s closed until 04:00.'
 	end
 	if func('autotraidF', 'is_open'):
 		'A <a href="exec: minut += 5 & gt ''autotraidF'', ''start''">car dealership</a> is nearby.'
@@ -126,7 +126,7 @@ if $ARGS[0] = '':
 	if tobiQW >= 1:'The old mansion, home to <a href="exec:gt ''kakuzu'', ''start''">Kakuzu</a>'
 
 	if age => 18:
-        'There is a huge building, with bright lights, which houses a <a href="exec: minut += 10 & gt ''casino'', ''outside''">Casino</a>.'
+        'A huge building covered in bright lights houses a <a href="exec: minut += 10 & gt ''casino'', ''outside''">casino</a>.'
     end
 
 	if hour >= 14 or hour < 4:
@@ -134,10 +134,10 @@ if $ARGS[0] = '':
 	else
 		'Located far away from the buildings is a barbecue. It''ll be open between 14:00 and 04:00'
 	end
-	if jouryResult = 10:'You can go to one of the apartment blocks and visit <a href="exec:gt ''youry'',''start''">Yuri''s</a> flat'
-	if BurgerQW['IlyQWTatianaHelp'] > 0:'In one of these building is <a href="exec:gt ''ilyroom''">Manager Ilyushkins</a> apartment'
+	if jouryResult = 10: 'You can go to one of the apartment blocks and visit <a href="exec:gt ''youry'',''start''">Yuri</a>.'
+	if BurgerQW['IlyQWTatianaHelp'] > 0:'In one of these buildings is <a href="exec:gt ''ilyroom''">Ilyushkin''s</a> apartment.'
 
-	'A long and high fence, which is build around the <a href="exec:gt ''Terminal''">storage terminal</a>'
+	'A long and high fence is built around the <a href="exec:gt ''Terminal''">storage terminal</a>.'
 end
 
 

locations/city_island.qsrc

@@ -11,12 +11,12 @@ $menu_arg = ''
 menu_off = 0
 close all
 if sound = 0:
-	if month >=11 and month <= 12 or month >=1 and month <=3:
-		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+	if month >=11 and month <= 12 or month >= 1 and month <= 3:
+		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street_night.mp3', 30 & PLAY 'sound/zima.mp3', 30
 	else
-		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 	end
 end
 clr
@@ -37,7 +37,7 @@ else
 	end
 end
 
-'The University area of the city, the University, shops, clubs and the like that cater to the college kids dominate this area of the city. There is only three bridges onto and off the island, plus the metro line.'
+'The university and shops and clubs that cater to the students dominate this area of the city.'
 
 !call random events from [street_events], and display them before show location.
 if streetevent_hour + 2 < hour:gt'street_event','city_island', 'main'
@@ -46,9 +46,9 @@ gs 'street_event', 'city_island', 'extras'
 
 if func('homes_properties', 'has_access', 'university_dorm') :act '<b>GO HOME</b> (University dorm)':gt 'uni_dorm', 'start'
 
-if car > 0 and cardrive = 25:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
+if car > 0 and cardrive = 25:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> stands in the parking lot.'
 
-if hour >= 4 and hour <= 23:
+if hour >= 4 and hour < 23:
 	act 'Walk to the Metro': gt 'metro', 'start'
 end
 
@@ -61,20 +61,20 @@ if hour >= 8 and hour <= 22:
 	'The <a href="exec: minut += 3 & gt ''uni_shop'', ''start''">supermarket</a> is not far from here.'
 	'You can see the <a href="exec:$loc = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 else
-	'The local convenience store is closed, they open again at 8:00'
-	'You can see a closed kiosk. It''s open between 08:00 - 23:00.'
+	'The local convenience store is closed. It will reopen at 08:00'
+	'You can see a closed kiosk. It''s open between 08:00 and 23:00.'
 end
 if hour >= 8 and hour < 22:
-	'You can see <a href="exec:gt ''shop_dolls'', ''start''">Patch Work Dolls</a> a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like. Next to <a href="exec:gt ''shop_nerdvana'', ''start''">Nerdvana</a> a clothing store for everything a nerd could desire.'
+	'You can see <a href="exec:gt ''shop_dolls'', ''start''">Patch Work Dolls</a>, a clothing store that caters to Alternative styles, like gothic, punk and skater. Next door is <a href="exec:gt ''shop_nerdvana'', ''start''">Nerdvana</a>, a clothing store that stock everything a nerd could desire.'
 else
-	'You can see Patch Work Dolls a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like. Next to that is Nerdvana the nerd clothing store, they both open every day between 08:00 - 22:00'
+	'You can see Patch Work Dolls, a clothing store that caters to Alternative styles, like gothic, punk, skater. Next door is Nerdvana, the nerd clothing store. They both open every day between 08:00 and 22:00'
 end
-if hour >= 7 and hour <= 23:
-	'You can see a sign advertising a coffee shop called <a href="exec: minut += 3 & gt ''city_coffee_hole'', ''start''">The Coffee Hole</a> just a few blocks from the University.'
+if hour >= 7 and hour < 22:
+	'You can see a sign advertising a coffee shop called <a href="exec: minut += 3 & gt ''city_coffee_hole'', ''start''">The Coffee Hole</a> just a few blocks away from the university.'
 else
-	'The The Coffee Hole, coffee shop is closed, they open again at 7:00'
+	'The Coffee Hole is closed. They reopen at 07:00.'
 end
-if hour >= 4:
+if hour >= 4 and hour < 23:
 	'The <a href="exec:minut += 1 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 else
 	'The Metro Station is closed. The first train will depart at 04:00.'
@@ -83,7 +83,7 @@ if anushkaCityQW['first_visit'] > 0:
 	'Anushka lives in <a href="exec:minut += 1 & gt ''anushapt_city'', ''home''">a shared apartment</a> around the corner.'
 end
 
-act 'Go to the University campus': 
+act 'Go to the university campus': 
 	minut += 1
 	gt 'uni_grounds', 'main'
 end
@@ -96,8 +96,8 @@ if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,3) = 'uni':
 	mainQW = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
-	'In front of your dorm, you see Tatiana and Gustav. Tatiana adjusts her glasses and looks around, while Gustav seems to be distracted, glancing here and there with a strange look on his face as his tattoos are not visible.'
-	'Tatiana looks at you closely, "I felt a burst of energy. Were you attacked by a magician?"'
+	'You see Tatiana and Gustav standing in front of your dorm. Tatiana adjusts her glasses and looks around, while Gustav seems to be distracted, glancing here and there with a strange look on his face as his tattoos are not visible.'
+	'Tatiana looks at you closely. "I felt a burst of energy. Were you attacked by a magician?"'
 	act 'No':gt 'mainQW'
 	exit
 end

locations/city_redlight.qsrc

@@ -12,11 +12,11 @@ if $ARGS[0] = 'start':
 	CLOSE ALL
 	if sound = 0:
 		if month >= 11 and month <= 12 or month >= 1 and month <= 3:
-			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3', 30 & PLAY 'sound/zima.mp3',30
 		else
-			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 		end
 	end
 

locations/city_residential.qsrc

@@ -11,12 +11,12 @@ menu_off = 0
 killvar '$locclass'
 
 if sound = 0:
-	if month >=11 and month <= 12 or month >=1 and month <=3:
-		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+	if month >= 11 and month <= 12 or month > =1 and month <= 3:
+		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3', 30
 	else
-		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 	end
 end
 
@@ -39,7 +39,7 @@ else
 	end
 end
 
-gs'street_event','city_residential', 'extras'
+gs 'street_event','city_residential', 'extras'
 
 if opusk > 0 or gnewQW = 5:
 	if rand(0,9) = 0:gt 'gopnew', 'start5'
@@ -84,7 +84,7 @@ if func('homes_properties', 'has_access', 'city_apartment'):
 		gt 'korr'
 	end
 end
-if hour >= 4 and hour <= 23:
+if hour >= 4 and hour < 23:
 	act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 end
 
@@ -107,28 +107,28 @@ if Enable_tablemap = 0:
 	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''">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 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 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 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 Petrovna''s</a> apartment.', '3'
+		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 slave''s</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''s</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''s</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
 
-if hour >= 5 and hour <= 23:'The <a href="exec: minut += 1 & gt ''metro'', ''start''">Metro</a> station is a 5 minute walk away.'
+if hour >= 4 and hour < 23:'The <a href="exec: minut += 1 & gt ''metro'', ''start''">Metro</a> station is a 5 minute walk away.'
 if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''start''">supermarket</a> is not far from here.'
 if (hour >= 8 and hour <= 20) or preg = 2:
 	'The <a href="exec:gt ''city_clinic'', ''start''">clinic</a> is also nearby.'
 else
-	'The clinic is close. It will open at 08:00.'
+	'The clinic is closed. It will open at 08:00.'
 end
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:
 	'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
@@ -158,7 +158,7 @@ if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building wh
 
 'The city''s large <a href="exec:minut += 20 & gt ''city_park'', ''start''">central park</a> is a 20 minute walk away.'
 'The city''s only <a href="exec:minut += 40 & gt ''city_lake'', ''start''">lake</a> is a 40 minute walk away.'
-'24 Hour <a href="exec:$loc = ''city_residential'' & gt ''city_pharmacy'', ''start''">Pharmacy</a>.'
+'A 24 hour <a href="exec:$loc = ''city_residential'' & gt ''city_pharmacy'', ''start''">pharmacy</a> is located nearby.'
 
 if Enable_tablemap = 0:
 	if hour >= 10 and hour < 22 and lesbiQW = 1:

locations/city_suburbs.qsrc

@@ -15,20 +15,20 @@ if $ARGS[0]='start':
 
 	if car > 0 and cardrive = 28:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> stands on the street.'
 
-    if hour >= 4 and hour <= 23:'The <a href="exec: minut += 20 & gt ''metro'', ''start''">Metro</a> station is a 20 minute walk from here.'
+    if hour >= 4 and hour < 23:'The <a href="exec: minut += 20 & gt ''metro'', ''start''">Metro</a> station is a 20 minute walk from here.'
 
 	gs 'taxi'
 
 	if AlexandriaQW > 6:
-		if hour > 7 and hour < 20:'You can visit <a href="exec: minut += 5 & gt ''AlexandriaHome'', ''intercom''">Aleksei''s home</a> if you want to see the cranky wizard.'
+		if hour > 7 and hour < 20: 'You can visit <a href="exec: minut += 5 & gt ''AlexandriaHome'', ''intercom''">Aleksei''s home</a> if you want to see the cranky wizard.'
 	end
 
 	if BDSMClub = 1 or BDSMmeet > 0:
-		act 'BDSM-club':gt'BDSM_Club','start'
+		act 'Go to the BDSM club': gt 'BDSM_Club','start'
 	end
 	
 	if func('homes_properties', 'has_access', 'matryona_mansion') = 0:
-		'There is a vacant piece of land for sale where a large mansion could be constructed.'
+		'There is a vacant plot of land for sale where a large mansion could be constructed.'
 		act 'Visit the land for sale': minut += 10 & gt 'city_mansion_entrance'
 	elseif func('homes_properties', 'is_property_of_status', 'owned', 'matryona_mansion'):
 		constructionstatus = func('homes_properties', 'get_property_construction_status', 'matryona_mansion')
@@ -37,7 +37,7 @@ if $ARGS[0]='start':
 		elseif constructionstatus = 1:
 			'You mansion is partially built near here.'
 		else
-			'Your mansion is not too far from her'
+			'Your mansion is not too far from here.'
 		end
 		act 'Visit your mansion': minut += 10 & gt 'city_mansion_entrance'
 	else
@@ -48,26 +48,25 @@ if $ARGS[0]='start':
 	act 'View the creepy old building': minut += 2 & gt 'city_suburbs', 'ps2'
 
 	act 'Walk to the main road':nroad = 1 & minut += 15 & gt 'road'
-	if hour >= 4 and hour <= 23:
+	if hour >= 4 and hour < 23:
 		act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 	end
 
 	if AlexandriaQW = 6:
 		gs 'willpower', 'misc', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Look for Alexandria''s direction (<<will_cost>> Willpower)':
+			act 'Look for Alexandria (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'easy'
-				gt'alexandriaEv','interview1'
+				gt 'alexandriaEv','interview1'
 			end
 		else
-			act 'Look for Alexandria''s direction (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Look for Alexandria (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 end
 
 if $ARGS[0]='ps1':
-	cla
-	*clr
+	*clr & cla
 	$menu_loc = 'city_suburbs'
 	$menu_arg = 'ps1'
 	menu_off = 0
@@ -77,12 +76,11 @@ if $ARGS[0]='ps1':
 	if psiklik = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/asylum0.jpg" ></center>'
 	if psiklik = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/asylum1.jpg" ></center>'
 
-	act 'Go': minut += 2 & gt'city_suburbs','start'
+	act 'Leave': minut += 2 & gt'city_suburbs','start'
 end
 
 if $ARGS[0]='ps2':
-	cla
-	*clr
+	*clr & cla
 	$menu_loc = 'city_suburbs'
 	$menu_arg = 'ps2'
 	menu_off = 0
@@ -91,7 +89,7 @@ if $ARGS[0]='ps2':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/abandoned.jpg" ></center>'
 	'An abandoned building that spoils the local communities appearance and intimidates local residents.'
 
-	act 'Go': minut += 2 & gt'city_suburbs','start'
+	act 'Leave': minut += 2 & gt'city_suburbs','start'
 end
 
 --- city_suburbs ---------------------------------

locations/metro.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'metro'
 	$menu_arg = 'start'
 	menu_off = 0
-	if sound = 0:PLAY 'sound/metro' + rand(1,4) + '.mp3',30
+	if sound = 0: PLAY 'sound/metro' + rand(1,4) + '.mp3', 30
 	'<center><b><font color="maroon">Metro station</font></b></center>'
 	if $loc = 'city_residential':
 		'<center><b><font color="maroon">Residential Area</font></b></center>'
@@ -116,14 +116,14 @@ if $ARGS[0] = 'vagon':
 	menu_off = 1
 
 	'<center><b><font color="maroon">Metro car</font></b></center>'
-	if hour < 7 or hour >=22:
-		if rand(0, 100) >= 70:gt 'metro_events', 'frot'
+	if hour < 7 or hour >= 22:
+		if rand(0, 100) >= 70: gt 'metro_events', 'frot'
 		metro_busy = rand(0,1)
 	elseif (hour >= 9 and hour < 16) or (hour >= 18 and hour < 22):
-		if rand(0, 100) >= 80:gt 'metro_events', 'frot'
+		if rand(0, 100) >= 80: gt 'metro_events', 'frot'
 		metro_busy = rand(1,2)
 	else
-		if rand(0, 100) >= 90:gt 'metro_events', 'frot'
+		if rand(0, 100) >= 90: gt 'metro_events', 'frot'
 		metro_busy = rand(2,3)
 	end
 
@@ -149,12 +149,12 @@ if $ARGS[0] = 'vagon':
 	end
 
 	act 'Get out of the car':
-		if hour < 7 or hour >=22:
-			if rand(0, 100) >= 70:gt 'metro_events', 'station'
+		if hour < 7 or hour >= 22:
+			if rand(0, 100) >= 70: gt 'metro_events', 'station'
 		elseif (hour >= 9 and hour < 16) or (hour >= 18 and hour < 22):
-			if rand(1,100) >= 80:gt 'metro_events', 'station'
+			if rand(1,100) >= 80: gt 'metro_events', 'station'
 		else
-			if rand(1,100) >= 90:gt 'metro_events', 'station'
+			if rand(1,100) >= 90: gt 'metro_events', 'station'
 		end			
 		gt 'metro', 'start'
 	end
@@ -197,7 +197,7 @@ if $ARGS[0] = 'shop':
 	end
 	if money >= 250:
 		'Buy enough <a href="exec:money -= 250 & joint += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <b>₽</b>'
-		if money >= 500:'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 10 joints for 500 <b>₽</b>'
+		if money >= 500: 'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 10 joints for 500 <b>₽</b>'
 	else
 		'Buy enough weed for 5 joints for 250 <b>₽</b> (You do not have enough money)'
 	end
@@ -206,8 +206,10 @@ end
 if $ARGS[0] = 'dealer':
 	*clr & cla
 	menu_off = 1
-	'He sizes you up with suspicion. "Hey there. Saw you buying Lady in the park." He clears his throat and spits onto the tracks. "That shit will mess you up." He opens his coat and you flinch, thinking he''s going to flash you, but instead see that he''s wearing a business suit underneath. He gestures at numerous pockets lining the insides of his coat, filled to bursting with various packages, pills and ampules. "Here, my products are of a much better quality. You''ll have a great time, and I guarantee they won''t kill you."'
-	act 'Continue':gt 'metro','shop'
+	'He sizes you up with suspicion. "Hey there. Saw you buying Lady in the park." He clears his throat and spits onto the tracks. "That shit will mess you up."' 
+	'He opens his coat and you flinch, thinking he''s going to flash you, but instead see that he''s wearing a business suit underneath.' 
+	'He gestures at numerous pockets lining the insides of his coat, filled to bursting with various packages, pills and ampules. "Here, my products are of a much better quality. You''ll have a great time, and I guarantee they won''t kill you."'
+	act 'Continue': gt 'metro','shop'
 end
 
 --- metro ---------------------------------