Merge remote-tracking branch 'julzor/master'

locations/FedorEv4.qsrc

@@ -2611,38 +2611,38 @@ if $ARGS[0] =  'Hallway':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/hallway.jpg"></center>'
 	'This is the central hallway which connects the whole house. There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a coat rack and multiple painting on the walls.'
 
+	act'<b>Leave the house</b>':
+		if $clothingworntype = 'nude':
+			gt 'FedorEv4', 'Nude'
+		elseif FedorHomeDate = 1 and week <= 5 and hour >= 14 and hour <= 24:
+			gt 'FedorEv4', 'End Date'
+		else
+			FedorHomeDate = 0 & gt 'pavResidential'
+		end
+	end
+	
 	if fedorKozlovQW > 1 and week <= 5 and hour >= 16 and hour <= 17:
-		act 'Bedroom':gt 'FedorMisc', 'Workout Time'
+		act 'Go to Fedor''s bedroom':gt 'FedorMisc', 'Workout Time'
 	else
-		act 'Bedroom':gt 'FedorEv4', 'Bedroom'
+		act 'Go to Fedor''s bedroom':gt 'FedorEv4', 'Bedroom'
 	end
 
 	if fedorKozlovQW > 1 and week <= 5 and hour >= 16 and hour <= 17:
-		act 'Bathroom':gt 'FedorMisc', 'Workout Time'
+		act 'Go to the bathroom':gt 'FedorMisc', 'Workout Time'
 	else
-		act 'Bathroom':gt 'FedorEv4', 'Bathroom'
+		act 'Go to the bathroom':gt 'FedorEv4', 'Bathroom'
 	end
 
 	if fedorKozlovQW > 1 and week <= 5 and hour >= 16 and hour <= 17:
-		act 'Kitchen':gt 'FedorMisc', 'Workout Time'
+		act 'Go to the kitchen':gt 'FedorMisc', 'Workout Time'
 	else
-		act 'Kitchen':gt 'FedorEv4', 'Kitchen'
+		act 'Go to the kitchen':gt 'FedorEv4', 'Kitchen'
 	end
 
 	if fedorKozlovQW > 1 and week <= 5 and hour >= 16 and hour <= 17:
-		act 'Living room':gt 'FedorMisc', 'Workout Time'
+		act 'Go to the living room':gt 'FedorMisc', 'Workout Time'
 	else
-		act 'Living room':gt 'FedorEv4', 'Livingroom'
-	end
-
-	act'Leave House':
-		if $clothingworntype = 'nude':
-			gt 'FedorEv4', 'Nude'
-		elseif FedorHomeDate = 1 and week <= 5 and hour >= 14 and hour <= 24:
-			gt 'FedorEv4', 'End Date'
-		else
-			FedorHomeDate = 0 & gt 'pavResidential'
-		end
+		act 'Go to the living room':gt 'FedorEv4', 'Livingroom'
 	end
 end
 

locations/anushapt.qsrc

@@ -53,16 +53,16 @@ if $ARGS[0] = 'home':
 	'You walk up to the front door and knock.'
 	if hour >= 22:
 		'It''s too late in the day to visit Anushka.'
-		act 'Move away from the door':gt'pavComplexb2','etaj_4'
+		act 'Move away from the door':gt'pavComplex', 'start'
 	elseif hour < 8:
 		'It''s too early in the day to visit Anushka.'
-		act 'Move away from the door':gt'pavComplexb2','etaj_4'
+		act 'Move away from the door':gt'pavComplex', 'start'
 	elseif ((hour >= 15 and hour < 20) or (week > 5 and hour >= 10 and hour < 20)) and (rand(0,4) = 0):
 		*clr & cla
 		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/valeria.jpg"></center>'
 		'You stand outside the Konstantinov household, knocking on the door. It takes quite a while before someone actually does come and in the end it turns out to be Anushka''s mother.'
 		'Her mother just stands there glaring at you for a while, "Well now don''t just stand there, what do you want? Oh wait let me guess, you want to see Anushka? Well the little slut isn''t here and I don''t know when she''ll be back. So why don''t you just go bother someone else." Before you can even get a word in, she slams the door in your face and you hear the all the locks click into place. Not having any other option, you turn to leave.'
-		act 'Move away from the door':gt'pavComplexb2','etaj_4'
+		act 'Move away from the door':gt'pavComplex', 'start'
 	elseif (hour >= 15 and hour < 22) or (week > 5 and hour >= 8 and hour < 22):
 		*clr & cla
 		'You stand outside the Konstantinov household, waiting for Anushka to come open the door.'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'hallway':
 		'You stand still for a little while longer, listening for something but nothing happens. After a while you decide to move on, you''re pretty sure that it was just Anushka''s younger brother Maksim spying on you.'
 	end
 	if AnushkaLoc ! 1:
-		act 'Leave Anushka''s apartment': gt 'pavComplex','start'
+		act '<b>Leave Anushka''s apartment</b>': gt 'pavComplex','start'
 		act 'Anushka''s Room': gt 'anushapt','anushroom'
 		act 'Bathroom': gt 'anushapt','bathroom'
 		act 'Anushka''s brother''s room': gt 'anushapt','brotherroom'
@@ -167,7 +167,7 @@ if $ARGS[0] = 'hallway':
 		act 'Parents Room': gt 'anushapt','anushparents'
 	else
 		'Anushka is standing next to, looking at you expectantly. "What''s up, <<$pcs_nickname>>?"'
-		act 'Leave Anushka''s apartment': gt 'pavComplex','start'
+		act '<b>Leave Anushka''s apartment</b>': gt 'pavComplex','start'
 		act 'Let''s go to your room':AnushkaLoc=2&gt'anushapt','anushroom'
 		act 'Let''s check on your brother':AnushkaLoc=3&gt'anushapt','brotherroom'
 	end

locations/dimaHome.qsrc

@@ -47,13 +47,13 @@ if $ARGS[0] = 'hallway':
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img  src="images/locations/pavlovsk/resident/dimkahome/hallway.jpg"></center>'
 	'You walk into the entrance hall of Dimka''s house, noticing that it is tastefully decorated. There is a small closet for your coat with a set of shelves and a mirror. This room leads to all other areas of the house.'
+	act '<b>Leave Dimka''s home</b>': gt 'pavResidential'
 	act 'Living Room': gt 'dimaHome','livingroom'
 	act 'Kitchen': gt 'dimaHome','kitchen'
 	act 'Bathroom': gt 'dimaHome','bathroom'
 	act 'Study': gt 'dimaHome','study'
 	act 'Basement': gt 'dimaHome','basement'
 	act 'Go upstairs': gt 'dimaHome','hallway2'
-	act 'Leave Dimka''s home': gt 'pavResidential'
 end
 
 if $ARGS[0] = 'bathroom':
@@ -151,13 +151,13 @@ if $ARGS[0] = 'hallway2':
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img  src="images/locations/pavlovsk/resident/dimkahome/hallway1.jpg"></center>'
 	'You enter the long upstairs hallway of Dimka''s home. It displays a warm, welcoming decor. This hall leads to all the other rooms on the second floor.'
+	act 'Go downstairs': gt 'dimaHome','hallway'
 	act 'Dimka''s Room': gt 'dimaHome','dimkaroom'
 	act 'Parents Room': gt 'dimaHome','dimkaparents'
 	act 'Guest room': gt 'dimaHome','guest'
 	act 'Bathroom': gt 'dimaHome','bathroom2'
 	!The balcony doesnt exist at the moment
 	!act 'Balcony': gt 'dimaHome','balcony'
-	act 'Go downstairs': gt 'dimaHome','hallway'
 end
 
 if $ARGS[0] = 'bathroom2':

locations/rolanapt.qsrc

@@ -99,22 +99,22 @@ if $ARGS[0] = 'hallway':
 	if rolan_panty_day ! daystart: rolan_panty_count = 1
 	if rolan_steal_day ! daystart: rolan_steal_count = 0
 
-	act 'Room': gt 'rolanapt','room'
-	act 'Bathroom': gt 'rolanbath','start'
-	act 'Guest Room': gt 'rolanapt','guestroom'
-	act 'Living Room': gt 'rolanapt','livingroom'
-	act 'Kitchen': gt 'rolanapt','kitchen'
-	act 'Grandma''s Room': gt 'rolanapt','grandmaroom'
 	if rolanworker = 4 and rolanknow = 1:
 		RolanLoc[hour] = 6
 		gs 'stat'
 		'You should check on Rolan, he seems really upset...'
-		act 'Leave Rolan''s apartment':
+		act '<b>Leave Rolan''s apartment</b>':
 			gt 'rolanapt', 'hallway'
 		end
 	else
-		act 'Leave Rolan''s apartment': gt 'pavComplex', 'start'
+		act '<b>Leave Rolan''s apartment</b>': gt 'pavComplex', 'start'
 	end
+	act 'Go to Rolan''s room': gt 'rolanapt','room'
+	act 'Go to the bathroom': gt 'rolanbath','start'
+	act 'Go to the guest room': gt 'rolanapt','guestroom'
+	act 'Go to the living room': gt 'rolanapt','livingroom'
+	act 'Go to the the kitchen': gt 'rolanapt','kitchen'
+	act 'Go to grandma''s room': gt 'rolanapt','grandmaroom'
 end
 
 if $ARGS[0] = 'room':

locations/shulgahall.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-	act 'Leave the apartment':minut += 1 & killvar '$boy' & gt'pod_ezd','etaj_3'
+	act '<b>Leave the apartment</b>':minut += 1 & killvar '$boy' & gt'pod_ezd','etaj_3'
 
 	act 'Go to the living room': gt 'shulga_room', 'start','hall'
 	if instr($maintxt,'hear') > 0:

locations/tanhouse.qsrc

@@ -54,13 +54,14 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		'Your contract states that, around this time, you should go to the living room and talk to Nicholas, so he can evaluate your day''s work.'
 	end
 
+	act '<b>Leave and go to the city center</b>':
 	act 'Go to the bathroom':gt 'tanvanr'
 	act 'Go to the kitchen':gt 'tankitchen'
 	act 'Go to your bedroom':gt 'tanspalnya'
 	act 'Go to the master bedroom':gt 'tanhozspal'
 	act 'Go to the living room':gt 'tanhousezal'
 	act 'Go to Tanya''s room':gt 'tanroom'
-	act 'Go outside (City Center)':
+	
 		if $clothingworntype ! 'nude':
 			gt'down'
 		else