Merge branch 'master' of http://git.tfgamessite.com/Breakout14/girllife-ecv

locations/HotelHole

@@ -1,16 +1,116 @@
 # HotelHole
 CLOSE ALL
 $metka = $ARGS[0]
+$prevloc = $loc
 $loc = $CURLOC
 $location_type = 'public_indoors'
 
 clr
 gs'stat'
 
+! use this args if  some event  transfers you directly to the lobby  and it is can happen  between  midnight and 01:00.
+if $ARGS[0] = 'skip_resepevent' :
+jump 'skipresepevent'
+end
+if hour = 0 and $prevloc ! 'HotelRoom':
+*clr
+		'When you want to enter the hotel you notice the doors are closed. '
+		'You try knocking on the door but nobody comes to open them. '
+	if resepseen = 0:
+		'This is strange, you think to yourself. The lobby is supposed to be open 24/7 '
+	end
+	if resepseen = 1:
+		'Damn it, if you want to catch the desk girl in the act you''ll have to find another way to enter the lobby at midnight.'
+	end
+	act 'Go back to the High Street':minut += 3 & gt'vokzalG'
+	exit
+end	
+if hour = 0 and $prevloc = 'HotelRoom':
+	if resepseen = 1:
+
+
+		*clr
+		cls
+		cla
+		gs 'stat'
+		' You go down to the lobby and silently watch around the corner.'
+		'You can see the desk girl is already giving her show to the camera''s'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event1.jpg"></center>'
+		'She flashes her breasts and gives a devious smile.'
+		'She also lifts up her skirt a few time showing her naked crotch.'
+		'Suddenly you see a man approaching her'
+		'It''s mister Leonidovich, the hotel manager'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event2.jpg"></center>'
+		'" Miss Tanich, What are you doing ? What if our guests should spot you like this ? " he says.'
+		'You think about the pictures  you found in his office and you wonder why he acts so surprised.'
+		'"Oh  Mister Leonidovich, I am so sorry, I have been a bad girl " she says while giving a guilty look to the manager'
+		'At that moment you figure out  they are just playing a game and being caught flashing was all part of their weird little roleplay.'
+		act 'Continue':
+			
+			*clr
+			cls
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event9.jpg"></center>'
+			'Soon they where caught in a passionate kiss while undressing eachother.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event3.jpg"></center>'
+			'Once all the clothes were off miss Tanich dropped to her knees and put her mouth around the fairly big penis.'
+			'She starts sliding her lips down the length of the cock and then slowly backing up.'
+			'Using only her tongue, she licked all around, focusing on the head and backing off occasionally.'
+			'She is sucking that cock like a real pro. You could learn a thing or two from this woman, you think to yourself'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event4.jpg"></center>'
+			'all of a sudden, she moves the dick between her breasts and starts rubbing it between them.'
+			'"Miss Tanich, you should slow down, I don''t want to blow my load before I get  to try that sweet little pussy of yours "'
+			act 'Continue':
+				
+				*clr
+				cls
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event5.jpg"></center>'
+				'So  Miss Tanich released his cock and pushed him down on to the bench. She turned around, positioned herself on top of his cock and slowly  lowered down.'
+				'She started riding him furiously while he stretched out his hands and started fondling her breasts.'
+				'From time to time  he gave her nipples a little pinch which made miss Tanich let out a little scream'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event6.jpg"></center>'
+				'After a few minutes Miss Tanich turned around and started riding him while they faced eachother.'
+				'You could see from the manager''s face that he was having trouble keeping up with her.'
+				gs 'arousal', 'voyeur',60
+				gs 'arousal', 'end'
+				act 'Continue':
+					*clr
+					cls
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event7.jpg"></center>'
+					'"Ok, my turn now" the manager suddenly yelled.'
+					'It seems like the desk girl knew exactly what he meant by that since she dismounted him and placed herself on her hands and knees.'
+					'He came up behind her and  started fucking her doggy style.'
+					'He did not last very long, after a few minutes he yelled " Here it comes"'
+					'He pulled out of her pussy and sprayed a big load all over her butt.'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event8.jpg"></center>'
+					'"Thank you Miss Tanich, I believer your monthly  bonus is again very much deserved"'
+					' Miss Tanich just smiled at him while showing off her pussy and cum stained buttocks'
+					'You have seen enough and quietly go back to your room'
+						
+						
+					act 'Continue':
+						if hotelroom = 1:gt'hotelroom','normal'
+						if hotelroom = 2:gt'hotelroom','better'
+						if hotelroom = 3:gt'hotelroom','best'
+					end
+				end
+			end
+		end
+	end
+	exit
+	if resepseen = 0:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event2.jpg"></center>'
+		'You enter the lobby and you can see the desk girl and the manager talking to each other.'
+		'When they notice you they both give you a very dissapointing look.'
+		'You get the feeling you interrupted something here.'
+	end
+end
+:skipresepevent
 '<center><H4>Pavlovsk hotel</H4></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.hole.jpg"></center>'
 'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & GT ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
 
+
+
 if hour >= 12 and hour <= 13 and GermanQW > 0:
 	'Next to the reception desk, you see a door labeled <a href="exec:minut += 1 & GT ''hoteladmin''">"Administration"</a>. That must be where the hotel manager works. The door is currently open.'
 end
@@ -76,7 +176,6 @@ act 'Kill some time in the hotel lobby ':
 	hotwait = 1
 	gt 'hotelhole'
 end
-
 act 'Leave the hotel':minut += 3 & gt'vokzalG'
 
 --- HotelHole ---------------------------------

locations/HotelWork

@@ -416,7 +416,7 @@ if $ARGS[0] = 'maid':
 			!! MJ: from 50,51 to 50,150 -- More often but less.
 			if chai1 < 25:chai = 50 + rand(0, maidstat)
 			
-			if maidrand <= 15:
+			if maidrand <= 10:
 				minut += 35
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/maid.work0,'+rand(0,3)+'.jpg"></center>'
@@ -430,6 +430,44 @@ if $ARGS[0] = 'maid':
 
 				act'Continue':gt 'hotelwork', 'maid'
 			end
+			if maidrand > 10 and maidrand <= 15:
+				minut += 30
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/goteladmin.jpg"></center>'
+				'While you are on your way to your next room you encounter mister Leonidovich, the manager of this hotel. He tells you he spilled a drink in his office and asks you to go clean it up.'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/office.jpg"></center>'
+				'You go to his office and clean up the spilled drink'
+				if maidstat < 20:'You don''t do a very good job. there are still stains of liquor everywhere.'
+				if maidstat >= 20 and maidstat<50:'Your maid skills have improved a fair bit.  You are able to get most of the stains out of the desk.'
+				if maidstat >= 50 and maidstat<70:'You are pretty good at cleaning rooms, and the room looks quite clean when you''re done with it. there is almost no trace left of the spilled drink'
+				if maidstat >= 70:'You''re a very experienced maid by now. You know how to clean up all sorts of spots and stains with ease, you easily remove all traces of liquor from the desk.'
+				if resepseen = 0:
+					'Just when you were about to leave the room you notice a folder lying on the ground beneath the desk. '
+					' You go and pick it up  but when you place it back with the other folders on the desk  you notice there are some pictures sticking out'
+					' It looks like security footage from the lobby'
+					
+					'should you take a look ?' 
+					act 'No, this is none of my business':
+						cla
+						if maidstat < 100:maidstat+=1
+						act'Continue':gt 'hotelwork', 'maid'
+					end
+					act 'Yeah, let''s see what'' s on these pictures':
+						cla
+						cls
+						'<left><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep_flash1.jpg"></left>'
+						'You can''t believe it, it is the girl from the reception exposing herself in the lobby.'
+						'<right><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep_flash2.jpg"></right>'
+						'There are dozens of pictures here. From the time stamps you can see that she  always exposes herself around midnight.'
+						'You wonder what would happen if you went to the lobby around midnight?'
+						resepseen = 1
+						act'Place the pictures back and continue your maid work ':gt 'hotelwork', 'maid'
+					end					
+				else
+					act'Continue':gt 'hotelwork', 'maid'
+				end
+			end
+			
 			if maidrand > 15 and maidrand <= 20:
 				hotelcouple = 1
 				gs 'stat'

locations/ParChurch

@@ -80,7 +80,7 @@ if $ARGS[0] = 'vigil':
 		moral += 1
 		gs 'stat'
 		temprand = rand(1,100)
-		if temprand >= 80:
+		if temprand <= 80:
 			if pav_sex > 10: pav_sex -= 10
 			if pav_prostitute > 10: pav_prostitute -= 10
 		end
@@ -111,8 +111,8 @@ if $ARGS[0] = 'liturgy':
 		pcs_sleep += 5
 		'You participate fully in the Divine Liturgy. You listen to the preaching and sing along. When going to communion and receiving the ceremonial bread, you lock eyes with Father Kirill. He seems happy to see you participating in the service.'
 	elseif pav_slut >= 50:
-		if rand(1,100) > 50:
-			if pav_sex > 10: pav_sex -= 10
+		if rand(1,100) > 20:
+			if pav_sex > 10: pav_sex -= 25
 			if pav_prostitute > 10: pav_prostitute -= 10
 		end
 		Kirill += 1
@@ -180,6 +180,8 @@ if $ARGS[0] = 'pray':
 	cls
 	randtime = rand(15,60)
 	minut += randtime
+	pav_sex -= 1
+	pav_prostitute -= rand(0,1)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_praying.jpg"></center>'
 	if hour >6 and hour < 20 and moral < 30:
@@ -321,7 +323,7 @@ if $ARGS[0] = 'amends':
 						Churchbad = 3
 						badrand = rand(7,21)
 						Churchbadtime = daystart + badrand
-						'You look the priest right in the eyes then when his attention is on you, you slowly lean forward, allowing your breasts to be exposed. To your delight, you see his eyes dart to your tits then snap back up to your face. His face flushes red."'
+						'You look the priest right in the eyes then when his attention is on you, you slowly lean forward, allowing your breasts to be exposed. To your delight, you see his eyes dart to your tits then snap back up to your face. His face flushes red.'
 						if Kirill <= 0: 
 						'"You whore!" The priest roars in fury, "I''ll teach you what happens to those who desecrate the House of God!"'
 						'Stunned by his unexpected fury, you were unable to react before the furious priest grabs you by the arm and drags you to his office.'

locations/ParChurch2

@@ -27,7 +27,7 @@ if $ARGS[0] = 'confession':
 	'"May the Lord bless you." the priest answered and blessed you with the Sign of the Cross then placed his right hand in your hands.'
 	'You kiss his hand and then straighten.'
 	'"Hello, my child. What''s troubling you?" he asks gently.'
-	'"Father, it has been <<lastconf>> days since I last confessed.'
+	'"Father, it has been <<lastconf>> days since I last confessed."'
 	if confK >= 10 and Kirill >= 60: gt 'ParChurch2', 'secrets'
 	minut += rand(20,45)
 	act 'Be honest':
@@ -49,7 +49,7 @@ if $ARGS[0] = 'confession':
 					'"Thank you for taking the time to speak with me Father." you say as he leads you to a quiet corner, "I admit I really don''t think I have anything to confess, but I felt like I should come see you."'
 					'"I always have time for God''s children." he replies, "Perhaps God wants you to speak to me."'
 					if moral <= 25: '"I doubt God is very interested in a schoolgirl in a nowhere town like this one." you quip, "At least He didn''t leave me any notes under my pillow."'
-					if moral >25 and moral <= 75: 'I don''t know, it''s not like I had a dream or something telling me to come." you say thoughtfully as you follw the priest.'
+					if moral >25 and moral <= 75: '"I don''t know, it''s not like I had a dream or something telling me to come." you say thoughtfully as you follw the priest.'
 					if moral > 75: '"You may be right Father." you reply happily, "I know God will speak to all of us if we are willing to listen."'
 					if godslut = 1: '"I''m sure he did, Father." you gush, "His love is like a guiding light and He often turns my thoughts to you."'
 				end

locations/hotel_resep

@@ -87,11 +87,11 @@ act'Rent a room':
 	end
 end
 if proshotelopen = 1 and proshotelday ! daystart:
-	act'Ask for ''the Peacock''':
+	act'Ask for ''The Peacock''':
 	proshotelday = daystart
 	cls
 	gs'stat'
-	'You approach the receptionist and ask for ''the Peacock''.'
+	'You approach the receptionist and ask for ''The Peacock''.'
 	'She picks up the phone and says : "<font color=#0000FF>Pavlin</font>, there is another one here for you."" sure I''ll send her right up"'
 	'she gives you a subtle smile and tells you <font color=#0000FF>Pavlin</font> is waiting for you in room 305'
 		act 'Go to room 305':
@@ -148,7 +148,7 @@ if proshotelopen = 1 and proshotelday ! daystart:
 					money += 750
 					!pavpros counter to be used to trigger future events
 					pavpros += 1
-					act'Go back to the hotel lobby':gt'HotelHole'
+					act'Go back to the hotel lobby':gt'HotelHole','skip_resepevent'
 				
 				end
 			end
@@ -164,10 +164,10 @@ If GermanQW<1:
 		'You approach the reception desk, and ask the girl: "Excuse me... I hear you are often looking for maids? I would like to come work as a maid here."'
 		'She nods understandingly, and takes a quick look at your figure: "We do often need maids, that''s true. I''d hire you in an instant, but unfortunately it''s not up to me. You should go see Herman Leonidovich, the hotel manager. He''s usually in his office between 12:00 and 14:00. I bet he will hire you! Good luck when you go see him!"'
 
-		act 'Step away from the reception desk':gt'HotelHole'
+		act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
 	end
 end
-act 'Step away from the reception desk':gt'HotelHole'
+act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
 
 --- hotel_resep ---------------------------------
 

locations/stat_display

@@ -308,6 +308,7 @@ if Enable_showrelation = 1:
 	if Ashot > 0:gs'show_table','Ashot: <<Ashot>>','2'
 	if Dmitry > 0:gs'show_table','Dima: <<Dmitry>>','2'
 	if afra > 0:gs'show_table','Blacks: <<afra>>','2'
+	if Rex > 0:gs'show_table','Rex: <<Rex>>','2'
 	if npc_rel['A69'] > 0:gs'show_table','Mikhail Nikolaevich: <<npc_rel[''A69'']>>','2'
 	if npc_rel['A89'] > 0:gs'show_table','Eugene: <<npc_rel[''A89'']>>','2'
 	if npc_rel['A112'] > 0:gs'show_table','Sergei Shulgin: <<npc_rel[''A112'']>>','2'