Merge branch 'master' of ssh://git.tfgamessite.com:9000/KevinSmarts/girllife-ecv

locations/Nord

@@ -60,8 +60,8 @@ if hour >= 5 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a
 if hour >= 9 and hour <= 17 and week > 1:'<a href="exec:gt ''autosalonF'', ''start''">Car Dealership</a>'
 if hour >= 9 and hour <= 20 and week < 7:'<a href="exec:gt ''autoservisF'', ''start''">Repair Shop</a>'
 if hour >= 9 and hour <= 17 and week > 1:'Used <a href="exec:gt ''autotraidF'', ''start''">Car Dealership</a>'
-if hour >= 9 and hour <= 17 and week < 6:'<a href="exec:gt ''dk'', ''start''">Community centre</a>'
-if hour >= 9 and hour <= 17 and week < 6 and bumtolik > 3:'<a href="exec:gt ''buklinik'', ''start''">Mercy clinic</a>'
+if hour >= 9 and hour < 17 and week < 6:'<a href="exec:gt ''dk'', ''start''">Community centre</a>'
+if hour >= 9 and hour < 17 and week < 6 and bumtolik > 3:'<a href="exec:gt ''buklinik'', ''start''">Mercy clinic</a>'
 if hour >= 8 and hour <= 20:'The parking lot, which is engulfed in bright lights, belongs to a <a href="exec:gt ''shop'', ''start''">Supermarket</a>'
 if hour >= 12 and hour <= 19:'Above the door to a basement room is a bright neon sign for the <a href="exec:gt ''pirsingsalon'', ''start''">Tattoo & Piercing parlor</a>'
 if tobiQW >= 1:'The old mansion, home to <a href="exec:gt ''kakuzu'', ''start''">Kakuzu</a>'

locations/down

@@ -126,7 +126,7 @@ if hour >= 8 and hour <= 22:'Infront of the expensive <a href="exec:gt ''restora
 
 if hour >= 6 and hour <= 23:'The <a href="exec:gt ''burger'', ''start''">Diner Bystroeshka</a> is open for low cost fast food.'
 if bordel > 0 and hour >= 20 or bordel > 0 and hour <= 3:'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
-if pornstudio >= 1 and hour > 5:'At the <a href="exec:gt ''pornstudio'', ''start''">Porn Studio</a>, where a variety of naughty movies are created'
+if pornstudio >= 1 and hour >= 10 and hour < 22:'At the <a href="exec:gt ''pornstudio'', ''start''">Porn Studio</a>, where a variety of naughty movies are created'
 if week < 6 and hour >= 7:'At the <a href="exec:gt ''univer'', ''start''">University</a> where you can earn your diploma.'
 if student > 0 or (hour >= 6 and hour <= 23):'The <a href="exec:gt ''dorm'', ''start''">Hostel</a> offers a small, but cheap, living space, for university students.'
 if week < 6 and hour >= 9 and hour <= 18:'You can see the most important <a href="exec:bankloc = 1 & gt ''bank'', ''start''">Bank</a> in the city from here.'

locations/metro

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 
 	'<center><img src="images/etogame/metro.jpg"></center>'
 	'Subway fare costs 16 <b>₽</b>.'
-	minut += 15
+	minut += 5
 	clr
 	gs 'stat'
 	fcolor = rgb(0, 0, 0)
@@ -23,28 +23,28 @@ if $ARGS[0] = 'start':
 
 	if money >= 16:
 		if $loc ! 'street':
-			act 'Go to the <b>residential area</b> (16 <b>₽</b>)':
+			act 'Go to the <b>Residential Area</b> (16 <b>₽</b>)':
 				$loc = 'street'
 				gt 'metro', 'vagon'
 			end
 		end
 
 		if $loc ! 'down':
-			act 'Go to the <b>center</b> (16 <b>₽</b>)':
+			act 'Go to the <b>City Center</b> (16 <b>₽</b>)':
 				$loc = 'down'
 				gt 'metro', 'vagon'
 			end
 		end
 
 		if $loc ! 'Nord':
-			act 'Go to the <b>northern area</b> (16 <b>₽</b>)':
+			act 'Go to the <b>Northern Area</b> (16 <b>₽</b>)':
 				$loc = 'Nord'
 				gt 'metro', 'vagon'
 			end
 		end
 
 		if $loc ! 'liam':
-			act 'Go to the <b>the old town</b> (16 <b>₽</b>)':
+			act 'Go to the <b>The Old Town</b> (16 <b>₽</b>)':
 				$loc = 'liam'
 				gt 'metro', 'vagon'
 			end

locations/stripclub

@@ -55,32 +55,56 @@ if $ARGS[0] = 'start':
 				end
 			end
 
-			if stripdance > 0 and stripwork = 0:
-				act 'Talk to the manager about working as a stripper':
-					cla
-					minut += 15
-					gs 'stat'
-					'You perform in the managers'' office. He is a young man and after you have finished he asks you to sit down, "We are open every day from 15 to 2 in the morning. Some days we have only male strippers. We don''t pay strippers, but the customers tip generously. Think of it as an incentive scheme, perform well and you earn a tip.'
-					'Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per lap dance, the stripper gets 800 <b>₽</b>, 200 is for the club. They may offer further private entertainment, the club cannot take any money for this, we are not a brothel.'
-					'Nearly forgot, lap dance is a straight striptease, dancing on stage involves a lot of work on the pole. Unless you dance on the pole, it is unlikely to earn you anything. There is no set schedule, strippers choose when they want to come to work. Bring casual work you can combine stripping with other types of work. So what do you think? interested?"'
+	if stripdance > 0 and stripwork = 0:
+			
+		act 'Talk to the manager about performing in the strip club':
+			cla
+			minut += 15
+			gs 'stat'
+	 		'The manager looks at you and asks you: "Are you really 18 years old? Because I got a visit from the police last week and they found an underaged girl working here. I was fortunate enough that the officers could be bribed."'
+
+			if age >= 18:
+				
+				'"Yes I am." You answer him.'
+				'You perform in the managers'' office. He is a young man and after you have finished he asks you to sit down, "We are open every day from 15 to 2 in the morning. Some days we have only male strippers. We don''t pay strippers, but the customers tip generously. Think of it as an incentive scheme, perform well and you earn a tip.'
+				'Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per lap dance, the stripper gets 800 <b>₽</b>, 200 is for the club. They may offer further private entertainment, the club cannot take any money for this, we are not a brothel.'
+				'Nearly forgot, lap dance is a straight striptease, dancing on stage involves a lot of work on the pole. Unless you dance on the pole, it is unlikely to earn you anything. There is no set schedule, strippers choose when they want to come to work. Bring casual work you can combine stripping with other types of work. So what do you think? interested?"'
+				
+			elseif fakepassport = 1:
+				
+				'"Yes I am." You answer, handing him your fake passport.'
+				'You see him frown as he checks your passport with suspicion.'
+				'"Well, I guess everything is in order."'
+				'You perform in the managers'' office. He is a young man and after you have finished he asks you to sit down, "We are open every day from 15 to 2 in the morning. Some days we have only male strippers. We don''t pay strippers, but the customers tip generously. Think of it as an incentive scheme, perform well and you earn a tip.'
+				'Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per lap dance, the stripper gets 800 <b>₽</b>, 200 is for the club. They may offer further private entertainment, the club cannot take any money for this, we are not a brothel.'
+				'Nearly forgot, lap dance is a straight striptease, dancing on stage involves a lot of work on the pole. Unless you dance on the pole, it is unlikely to earn you anything. There is no set schedule, strippers choose when they want to come to work. Bring casual work you can combine stripping with other types of work. So what do you think? interested?"'
+				
+			else
+				'"Nearly..." You plead.'
+				'"Right. You need to leave this establishment, be sure to come back when you are old enough.'
+						
+					act 'Leave':gt 'down'
+					exit
+					
+			end
 
-					act 'No':gt 'stripclub', 'start'
+				act 'No':gt 'stripclub', 'start'
 
-					act 'Yes':
-						cls
-						stripwork = 1
-						'Yes, happy with everything you nod. The manager leads you to the dressing room and shows you the woman who is responsible for the costumes. He introduces you to the chief of security, who printed you a pass and he returned to his office.'
+				act 'Yes':
+					cls
+					stripwork = 1
+					'Yes, happy with everything you nod. The manager leads you to the dressing room and shows you the woman who is responsible for the costumes. He introduces you to the chief of security, who printed you a pass and he returned to his office.'
 
-						if cfnm = 0:act 'Look around':gt 'stwork', 'start'
+					if cfnm = 0:act 'Look around':gt 'stwork', 'start'
 
-						if cfnm = 1:
-							'Today the program is male striptease, so the room is full of guys getting ready to perform.'
+					if cfnm = 1:
+						'Today the program is male striptease, so the room is full of guys getting ready to perform.'
 
-							act 'Leave':gt 'stripclub', 'start'
-						end
+						act 'Leave':gt 'stripclub', 'start'
 					end
 				end
 			end
+	end
 
 			if cfnm = 0 and stripwork > 0:
 				act 'Walk into the dressing room':frost = 0 & gt 'stwork', 'start'

locations/young_shop

@@ -29,25 +29,25 @@ lcolor = rgb(106, 90, 205)
 '<b><center><font size="4">Keys-pussy</font></center></b>'
 '<center><img src="images/pictures/young_shop.jpg"></center>'
 'A Small shop clothing for young people. Mostly pretty bold outfits for emancipated young people with attractive bodies.'
-'Manager works from 8:00 to 18:00.'
+'Manager works weekdays from 09:00 to 18:00.'
 
 !!if young_shop_work = 0:
 ! WD: Set managment hours
-if hour >= 8 and hour <= 18 and young_shop_work = 0 and week < 6:
-	act '<font color="navy">Go to the manager</font>':
+if hour >= 9 and hour < 18 and young_shop_work = 0 and week < 6:
+	act '<font color="navy">Talk to the manager</font>':
 		minut += 1
 		gt 'andrey'
 	end
 end
 
-if hour >= 8 and hour <= 18 and young_shop_work = 3 and week < 6:
-	act '<font color="navy">Go to the manager, maybe he will hire you again</font>':
+if hour >= 9 and hour < 18 and young_shop_work = 3 and week < 6:
+	act '<font color="navy">Talk to the manager, maybe he will hire you again</font>':
 		minut += 1
 		gt 'andrey'
 	end
 end
 
-act '<b>Get out of the shop</b>':
+act '<b>Leave the shop</b>':
 	minut += 3
 	gt 'torgcentr'
 end
@@ -75,7 +75,7 @@ if ((hour = 15 and minut <= 5) or (hour = 14 and minut >= 30)) and young_shop_wo
 		if random > 75 and random <= 80:gt 'young_shop', '5'
 
 		if random >= 1 and random <= 20 and (kira <> 0 or young_shop_salary < 3):
-			'A regular days work, nothing interesting happens and its now time to got home.'
+			'A regular days work, nothing interesting happens and its now time to go home.'
 
 			act 'Finish the job':dynamic $endwork
 		elseif random >= 1 and random <= 20 and kira = 0 and young_shop_salary >= 3:
@@ -84,14 +84,14 @@ if ((hour = 15 and minut <= 5) or (hour = 14 and minut >= 30)) and young_shop_wo
 			kira = 1
 			'<b><center><font size="4"><font color="black">Case for paper</font></center></b>'
 			'Twenty minutes before the end of the day a lady comes up to me with a glamorous looking girl. The Girl constantly turns and asks the woman:'
-			'"Mom, this is not necessary. Let''s not buy in this store .. Well, MAAM .."'
-			'"Stop acting up! All your classmates are wearing this clothes. I do not want my girl to be bullied because she is not like them at all!" The Woman is full of determination and certainly won''t change her intentions.'
+			'"Mom, this is not necessary. Let''s not shop in this store .. Well, MAAM .."'
+			'"Stop acting up! All your classmates are wearing these sort of clothes. I do not want my girl to be bullied because she is not like them at all!" The Woman is full of determination and certainly won''t change her intentions.'
 			'"Hello, can I help you?" With a smile on your face you walk over to the mother and her daughter.'
 			'The Lady inspects you appraising your appearance, then turns her head to her daughter:'
 			'"You see, Kira, this girl is only a little older than you, and dressed .." She does not have time to finish the sentence, because Kira starts acting up again:'
 			'"Well, here where hardly anyone sees it! I can not be seen on the street in these clothes and without a bra. People will be able to see everything!"'
 			'"And why shouldn''t they?" The Woman throws up her hands in surprise, "You are grown up. It would be a shame not to show it! So, that''s enough, I''m tired."'
-			'She turns to you with a haughty smile and looks you in the eye:'
+			'She turns to you with a haughty smile and looks you in the eyes:'
 			'"Girl, tell me, would clothes like yours fit my Kira?" she says with a little nod clearly just waiting for a positive response.'
 
 			act 'Yes, of course':