Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife

locations/hotel_resep.qsrc

@@ -11,7 +11,7 @@ if hotelcollect > 0:
 	'The brunette quickly checks the computer and then gives you <<maidtime*250>> <b>₽</b> for all the shifts you worked in the hotel.'
 	maidtime=0
 end
-	
+
 act'Rent a room':
 	cls
 	gs'stat'
@@ -49,7 +49,7 @@ act'Rent a room':
 				end
 				if hotelroom1day = 0:gt'HotelHole'
 			end
-				
+
 			act'Luxury room':
 				*clr
 				cla
@@ -65,7 +65,7 @@ act'Rent a room':
 				end
 				if hotelroom1day = 0:gt'HotelHole'
 			end
-				
+
 			act'Royal suite':
 				*clr
 				cla
@@ -87,7 +87,7 @@ act'Rent a room':
 	end
 end
 if proshotelopen = 1 and proshotelday ! daystart:
-	act'Ask for ''The Peacock''':
+	act'Ask for "The Peacock"':
 		if pavhotprosQW = 6:
 			pavhotprosQW = 7
 			PavlinQW = 1
@@ -159,7 +159,7 @@ if $ARGS[0] = 'pavlbar':
 		act'Go back to the hotel lobby':gt'HotelHole','skip_resepevent'
 		exit
 	end
-	
+
 	if npc_rel['A217'] > 6:
 		'"This was not what we agreed to you say, I need more..."'
 		'"Sure, you can have more, but you need to do some extra work for that."'
@@ -177,7 +177,7 @@ if $ARGS[0] = 'pavlbar':
 			cls
 			'"Fine" you say. You open his fly and take out his half-erect penis.'
 			if npc_rel['A217'] >= 10:
-				
+
 				'"Why don''t you use your mouth today?"'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin_bj.jpg"></center>'
 				'You look around to make sure nobody is watching you and then move your head towards his penis.'
@@ -185,11 +185,11 @@ if $ARGS[0] = 'pavlbar':
 				'You sit straight again and look at Pavlin.'
 				gs 'arousal', 'bj', 5, 'prostitution'
 				swallow +=1
-			else	
+			else
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin_hj.jpg"></center>'
 				'After two minutes of stroking you can feel him coming all over your hand.'
 				gs 'arousal', 'hj', 5, 'prostitution'
-				
+
 			end
 			'With a stupid grin on his face he reaches in his pocket and hands you an extra 250 <b>₽</b>.'
 			money += 1000
@@ -197,7 +197,7 @@ if $ARGS[0] = 'pavlbar':
 			if npc_rel['A217'] <= 15 or npc_rel['A217'] > 19:npc_rel['A217'] += 1
 			act'Go back to the hotel lobby':gt'HotelHole','skip_resepevent'
 		end
-			
+
 	end
 	if npc_rel['A217'] <= 5:
 		'You are sure the money he received from the customer was more than double this amount but you don''t feel like arguing.'
@@ -214,7 +214,7 @@ if $ARGS[0] = 'pavlbar':
 		'"You are right <<$pcs_firstname>>, come with me to my car I''ll give you a bonus today."'
 		'You are excited at the prospect of finally getting the money you earned but you are unsure if you can trust Pavlin.'
 		minut += 5
-		
+
 		act 'Take no chances, accept the amount for today':
 			cls
 			money += 750
@@ -231,8 +231,8 @@ if $ARGS[0] = 'pavlbar':
 			'Once you turned the corner and are out of sight from the street Pavlin suddenly grabs you by the shoulders and throws you against the wall'
 			'You are stunned and want to say something when suddenly Pavlin hits you with his fist in your face'
 			'"WHO DO YOU THINK YOU ARE, BITCH? You work for ME, I decide how much money you get. YOU UNDERSTAND ME?"'
-			'He is screaming and after every sentence he hits you in the face again.' 
-			!only check for strength and dom at the moment, might change later 
+			'He is screaming and after every sentence he hits you in the face again.'
+			!only check for strength and dom at the moment, might change later
 			if pcs_dom > 50 and pcs_stren > 60:
 				PavlinQW = 3
 				'You try to defend yourself and start hitting back. He did not expect this and is startled for a moment.'
@@ -255,7 +255,8 @@ if $ARGS[0] = 'pavlbar':
 				pavlevent = 1
 				pavldaystart = daystart
 				npc_rel['A217'] = 3
-			
+				fingal = 1
+
 			act'Run away':gt'vokzalG'
 		end
 	end
@@ -282,27 +283,27 @@ if $ARGS[0] = 'pavgenpros':
 	pavproscount += 1
 	cls
 	gs'stat'
-	gs 'npcgeneratec', '0'				
+	gs 'npcgeneratec', '0'
 	gs 'boyStat', $npclastgenerated
 	'The customer was <<$npc_notes[$npclastgenerated]>> and introduced himself as <<$boydesc>>.'
 	'Then you both got undressed and you started doing your job.'
 	picrand = rand(0, 14)
 	'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<picrand>>.mp4"></video></center>'
 	gs 'dinsex','dinrandbj'
-	
+
 	'You move the dick out of your mouth and tell him to put on a condom and fuck you.'
 	if pcs_dom >= 25:
 		'The man wanted to start arguing but he could see you would not be pursuaded.'
 		gs 'dinsex', 'boy_puts_his_condom'
 	elseif rand(0,2) = 1 and pcs_dom < 25:
-	
+
 		'The man started laughing and tells you he paid to fuck you ''raw'' so that''s what he was going to do.'
 		dynamic $venerasiak
-		
+
 	else
 		'The man started arguing but you could convince him that using a condom would be safer for both of you.'
 		gs 'dinsex', 'boy_puts_his_condom'
-		
+
 	end
 	gs 'dinsex','vaginal_sex'
 	picrand = rand(1, 5)
@@ -330,7 +331,7 @@ if $ARGS[0] = 'pavgenpros':
 			gs 'arousal', 'end'
 			act'Go to the bar':gt 'hotel_resep','pavlbar'
 		end
-			
+
 	else
 		gs 'dinsex','sexcum'
 		act'Go to the bar':gt 'hotel_resep','pavlbar'

locations/sisterQW.qsrc

@@ -703,7 +703,7 @@ if $ARGS[0] = 'sisboyQW_party':
 	'You began to help the guys to lay out the table, they carried the drinks, you snacks, but there was so much booze that it covered the table leaving no where to put the snacks.'
 	'Everyone started to thump in unison, dealing, laughing, telling funny stories.'
 	'You cheerfully ask Anya. "You won''t leave me alone at the party will you?"'
-    'Anya smiles and hands you a bottle of vodka. "Of course not <<$pcs_nickname>>."'
+	'Anya smiles and hands you a bottle of vodka. "Of course not <<$pcs_nickname>>."'
 	act 'Drink':
 		cls
 		minut += 15
@@ -720,8 +720,8 @@ if $ARGS[0] = 'sisboyQW_party':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
 		'You took the bottle from her hands'
-        '"Well, let''s party." You say and gulp down a huge amount of vodka.'
-        ' Roma looks at Anya and smirks. "Look, <<$pcs_nickname>> is drinking more than you." with these words, everyone began to drink heavily.'
+		'"Well, let''s party." You say and gulp down a huge amount of vodka.'
+		' Roma looks at Anya and smirks. "Look, <<$pcs_nickname>> is drinking more than you." with these words, everyone began to drink heavily.'
 		act 'Go dance': gt 'sisterQW', 'dance'
 		act 'Drink': gt 'sisterQW', 'drink'
 		act 'Sit': gt 'sisterQW', 'sit'
@@ -742,8 +742,8 @@ if $ARGS[0] = 'sisboyQW_party':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
 		'You politely try and refuse the drink.'
-        'But seeing everyone watching gathered around began to chant: "Drink, drink, drink, drink, drink, drink."'
-        'Giving into peer pressure you take the bottle from Anya''s hand, and gulp down a huge amount of vodka.'
+		'But seeing everyone watching gathered around began to chant: "Drink, drink, drink, drink, drink, drink."'
+		'Giving into peer pressure you take the bottle from Anya''s hand, and gulp down a huge amount of vodka.'
 		act 'Go dance': gt 'sisterQW', 'dance'
 		act 'Drink': gt 'sisterQW', 'drink'
 		act 'Sit': gt 'sisterQW', 'sit'
@@ -759,8 +759,8 @@ if $ARGS[0] = 'sisboyQW_party':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
 		'Standing, you tried to get out from behind the table, to go dancing, but no one was dancing they was all just sitting and drinking.'
-        'Seeing, you got up and wanting to leave the table, Rex pulls you over: "Where are you going, it''s only the beginning, hold the bottle, and let''s drink, otherwise I would be offended."'
-        'You couldn''t deny the birthday boy and took the bottle from his hands, and gulp down a huge shot, feeling it burn down your throat. You hear others shouting in encouragement.'
+		'Seeing, you got up and wanting to leave the table, Rex pulls you over: "Where are you going, it''s only the beginning, hold the bottle, and let''s drink, otherwise I would be offended."'
+		'You couldn''t deny the birthday boy and took the bottle from his hands, and gulp down a huge shot, feeling it burn down your throat. You hear others shouting in encouragement.'
 		act 'Go dance': gt 'sisterQW', 'dance'
 		act 'Drink': gt 'sisterQW', 'drink'
 		act 'Sit': gt 'sisterQW', 'sit'
@@ -930,14 +930,15 @@ end
 if $ARGS[0] = 'reks':
 	cls
 	minut += 5
-	alko += 1
+	alko += 2
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_19.jpg"></center>'
 	*nl
-	'You''ve clearly been having fun this evening and to his surprise you are still covered in semen.'
+	!!'You''ve clearly been having fun this evening and to his surprise you are still covered in semen.'
+	!! 'Not sure how Sveta is supposed to be covered in semen at this point, as there is no application or check on this that I could see - 3xpurt'
 	'"Hey girly, damn you''ve been having fun. Oh yeah, you''re Anya''s sister, I know, she''s... that''s odd, I haven''t seen her. Although I have been drinking bubbly all day, here, drink up."'
 	'With this he starts pouring the sweet Champagne down your throat, he''s so drunk he pours it much to fast and as much as you try to keep up, alot of it spills on the floor.
 	 Then, without a word, Rex just staggers off.'
@@ -1002,7 +1003,7 @@ if $ARGS[0] = 'two_boy':
 			'"Fuck I think you''re right, she''s a sweet little thing, but I don''t fuck Schoolgirls." Looking at his friend getting a blowjob from you. "Hey I''ll trade you."'
 			gs 'arousal', 'vaginal', 5, 'sub', 'group', 'unknown'
 			gs 'arousal', 'bj', 5, 'sub', 'group', 'unknown'
-			minut -= 5 
+			minut -= 5
 			gs 'stat'
 			act 'Switch':
 				cls
@@ -1027,7 +1028,7 @@ if $ARGS[0] = 'two_boy':
 				gs 'arousal', 'vaginal', 5, 'sub', 'group', 'unknown'
 				gs 'arousal', 'bj', 5, 'sub', 'group', 'unknown'
 				gs 'arousal', 'end'
-				minut -= 5 
+				minut -= 5
 				gs 'stat'
 				act 'Look For Anya': gt 'sisterQW', 'anna_find'
 			end