[fixed] added komp to bedr, added possibility to cancel an apartment if you own both, fixed machine translation in liam

locations/agentned.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 
 	if home_owned[1] = 2 or home_owned[3] > 0 or home_owned[5] = 1:
 		*nl
-		'You own the follwing property:'
+		'You own the following property:'
 		*nl
 		if home_owned[1] = 2: 'An apartment in St. Petersburg residential area'
 		if home_owned[1] = 3: 'An apartment in St. Petersburg residential area, that is currently occupied by your tenants'
@@ -43,13 +43,28 @@ if $ARGS[0] = 'start':
 		'We are at your service if you decide to <a href="exec:gt ''agentned'',''sell''">sell</a>.'
 	end
 
-	act 'Leave':
-		minut += 5
-		gt'down'
-	end
+	act 'Leave': minut += 5 & gt'down'
 	
 	act 'View rentals': gt 'agentned', 'rent'
 	act 'View properties for sale': gt 'agentned', 'buy'
+	if (home_owned[1] = 1 or home_owned[1] = 2) and home_owned[4] = 1: 
+		if home_owned[1] = 1:
+			act 'Cancel the lease of the city apartment':
+				cla & *nl
+				'Warning: You won''t be able to return to your apartment, when you cancel the lease.'
+				
+				act 'Return': gt'agentned', 'start'
+				act 'Cancel it': home_owned[1] = 0 & gs 'set_home', 4 & gt'agentned', 'start'
+			end
+		end
+		act 'Cancel the lease of the apartment in Pushkin':
+			cla & *nl
+			'Warning: You won''t be able to return to your apartment, when you cancel the lease.'
+			
+			act 'Return': gt'agentned', 'start'
+			act 'Cancel it': home_owned[4] = 0 & gs 'set_home', 1 & gt'agentned', 'start'		
+		end
+	end
 end
 
 if $ARGS[0] = 'buy':
@@ -249,19 +264,16 @@ if $ARGS[0] = 'rent':
 	
 	if home_owned[1] > 0 and home_owned[4] > 0:
 		'We currently have no properties for rent.'
-
 	elseif home_owned[1] = 0 and home_owned[4] = 0:
-		''
+		*nl
 		'There are two properties available for rent.'
 		*nl
 		'There is an apartment in the city residential area, and an apartment in Pushkin available'
 		act 'View the city apartment details': gt 'agentned', 'rent_cityres'
 		act 'View the Pushkin apartment details': gt 'agentned', 'rent_pushkin'
-
 	elseif home_owned[1] = 0:
 		'There is a property for rent in the city residential area'
 		act 'View the city apartment details': gt 'agentned', 'rent_cityres'
-
 	elseif home_owned[4] = 0:
 		'There is a property for rent in the old town of Pushkin'
 		act 'View the Pushkin apartment details': gt 'agentned', 'rent_pushkin'
@@ -278,6 +290,18 @@ if $ARGS[0] = 'rent_cityres':
 	'"We have a flat available right now in the residential area of St. Petersburg." The receptionist says as he starts pulling out the paperwork. "Rent is <<$home_rent_txt[1]>> ₽ and leases have to be renewed every 30 days, which can be taken automatically from your account or you can come in and pay directly. Last but not least, you have to make your first payment up front at signing."'
 	'<br>He pulls out a pen and slides the paperwork onto the counter. "Interested? We can get you moved in right away."'
 	
+	act 'Decline':
+		*clr & cla
+		minut += 5
+		'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
+		*nl
+		'You shake your head, "Actually, I need more time to think about this."'
+		'<br>The receptionist seems a bit miffed, but says nothing as he grabs the paperwork and stuffs it back in a drawer.'
+
+		act 'Return':gt'agentned', 'start'
+	end
+	
 	if money >= home_rent[1] or karta >= home_rent[1]:
 		act 'Agree and pay':
 			*clr & cla
@@ -303,10 +327,22 @@ if $ARGS[0] = 'rent_cityres':
 		*nl
 		'You do not have enough money with you or in your bank account to rent this.'
 	end
+end
+
+if $ARGS[0] = 'rent_pushkin':
+	*clr & cla
+	menu_off = 1
+	gs 'housing', 'rent'
+	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
+	*nl
+	'"We have a small apartment available right now in Pushkin’s city center. It’s a little bit pricey, but it’s been recently renovated to be more modern, and it looks quite nice. You won’t find a place like that outside of Pushkin." The receptionist says as he starts pulling out the paperwork. "Rent is <<$home_rent_txt[4]>> ₽ and leases have to be renewed every 30 days, which can be taken automatically from your account or you can come in and pay directly. Last but not least, you have to make your first payment up front at signing."'
+	'<br>He pulls out a pen and slides the paperwork onto the counter. "Interested? We can get you moved in right away."'
 	
 	act 'Decline':
 		*clr & cla
 		minut += 5
+		gs 'stat'
 		'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 		*nl
@@ -315,17 +351,6 @@ if $ARGS[0] = 'rent_cityres':
 
 		act 'Return':gt'agentned', 'start'
 	end
-end
-
-if $ARGS[0] = 'rent_pushkin':
-	*clr & cla
-	menu_off = 1
-	gs 'housing', 'rent'
-	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
-	*nl
-	'"We have a small apartment available right now in Pushkin’s city center. It’s a little bit pricey, but it’s been recently renovated to be more modern, and it looks quite nice. You won’t find a place like that outside of Pushkin." The receptionist says as he starts pulling out the paperwork. "Rent is <<$home_rent_txt[4]>> ₽ and leases have to be renewed every 30 days, which can be taken automatically from your account or you can come in and pay directly. Last but not least, you have to make your first payment up front at signing."'
-	'<br>He pulls out a pen and slides the paperwork onto the counter. "Interested? We can get you moved in right away."'
 	
 	if money >= home_rent[4] or karta >= home_rent[4]:
 		act 'Agree and pay':
@@ -351,19 +376,6 @@ if $ARGS[0] = 'rent_pushkin':
 		*nl
 		'You do not have enough money with you or in your bank account to rent this.'
 	end
-	
-	act 'Decline':
-		*clr & cla
-		minut += 5
-		gs 'stat'
-		'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
-		*nl
-		'You shake your head, "Actually, I need more time to think about this."'
-		'<br>The receptionist seems a bit miffed, but says nothing as he grabs the paperwork and stuffs it back in a drawer.'
-
-		act 'Return':gt'agentned', 'start'
-	end
 end
 
 if $ARGS[0] = 'buy_cityres':

locations/bedr.qsrc

@@ -222,6 +222,8 @@ end
 
 dynamic $palelady
 
+if komp = 1:'On the other bedside table is your <a href="exec:gt ''Komp'',''start''">laptop</a>.'
+
 if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
 
 if pornMagazine > 0:'Under your mattress you hide a porn magazine.'

locations/liam.qsrc

@@ -45,7 +45,7 @@ end
 'Close by is a narrow street leading to a <a href="exec:gt ''dvor'',''start''">vacant house</a>.'
 'You see a <a href="exec:gt ''ugol'',''start''">passage</a> between the houses lead to a courtyard.'
 if car > 0 and cardrive = 14:
-	'I parked at the curb <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
+	'I parked at the curb <a href="exec:gs ''carF'',''start''">your <<$car>></a>.'
 end
 
 if hour >= 13 and hour <= 15 and bodimodel = 1 and arts = 0 and tusa = 1:
@@ -70,16 +70,18 @@ act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
 
 act 'Wait':gs 'obj_din', 'wait'
 
-act 'Walk 1 h':
-	cla
-	minut += 60
-	pcs_mood += 10
-	gs 'stat'
-	'You slowly walk along the narrow streets of the Old Town, It became one of the areas of the big city, admiring the beautiful architecture buildings, built long ago and miraculously survived to our times. Breathe in the fresh air, reflecting on the vicissitudes of fate.'
-	act 'Complete outing':gt'liam','start'
+if pushkin_walk_day ! daystart:
+	act 'Take a walk (1:00)':
+		cla & *nl
+		minut += 60
+		pcs_mood += 10
+		pcs_willpwr += 1
+		pushkin_walk_day = daystart
+		gs 'stat'
+		'You breathe in the fresh air and slowly walk along the narrow streets of the Old Town admiring the beautiful architecture.'
+		act 'Continue': gt'liam', 'start'
+	end
 end
 
-!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
-
 --- liam ---------------------------------