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

# Conflicts:
#	locations/begin
#	locations/clothing_QV
#	locations/gdktoilet
#	locations/obj_din

locations/begin

@@ -148,7 +148,7 @@ if $ARGS[0] = 'lip':
 	if pcs_lip = 1:$pcs_lip = 'You have normal<<$pcs_lipbalm>> lips.' & $liptalk = 'soft lips' & $liptalk2 = 'delicate lips' & $liptalk3 = 'tender lips'
 	if pcs_lip = 2:$pcs_lip = 'You have plump<<$pcs_lipbalm>> lips.' & $liptalk = 'plump lips' & $liptalk2 = 'plump lips' & $liptalk3 = 'plump lips'
 	if pcs_lip = 3:$pcs_lip = 'You have large,<<$pcs_lipbalm>> full lips.' & $liptalk = 'full lips' & $liptalk2 = 'plump lips' & $liptalk3 = 'full lips'
-	if pcs_lip = 4:$pcs_lip = 'You have huge, thick <<$pcs_lipbalm>> lips.' & $liptalk = 'thick lips' & $liptalk2 = 'thick lips' & $liptalk3 = 'thick lips'
+	if pcs_lip = 4:$pcs_lip = 'You have huge, thick<<$pcs_lipbalm>> lips.' & $liptalk = 'thick lips' & $liptalk2 = 'thick lips' & $liptalk3 = 'thick lips'
 	'<center>Adjust the size of your lips to match your <a href="exec:view''images/avatar.jpg''">image</a>:</center>'
 	*nl
 	'<center><i><<$pcs_lip>></i></center>'

locations/cikl

@@ -985,7 +985,7 @@ if storyline = 1:
 		if sisboyparty = -1: sisboyparty = 1
 
 		if sisboypartyQW >= 2 and sisboyparty > 0:
-			sisboyparty_day = daystart + rand(4,6)
+			sisboyparty_day = daystart + rand(3,5)
 		end
 	end
 

locations/clothing_QV

@@ -172,7 +172,7 @@ if $ARGS[0] = 'change':
 	cla
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 	'<center><img src="<<FUNC(''$clothing_image'',  $ARGS[1], ARGS[2])>>"></center>'
-	$RESULT = FUNC('$short_description', $ARGS[1], Clostyle2)
+	$RESULT = FUNC('$short_description', $ARGS[1], CloStyle2)
 	$RESULT += '<<ARGS[2]>>'
 	'<<$RESULT>>'
 	if $ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear':

locations/din_bad

@@ -607,7 +607,7 @@ $d_bag = {
         pl'<a href="exec:dynamic $use_aphrodisiac & dynamic $d_bag"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
     end
     
-	if lubri > 0:pl'Do you have lubricant. Enough for  <<lubri>> time.'
+	if lubri > 0:pl'You have a tube of lubricant - enough for <<lubri>> applications.'
 	if bottle > 0:pl 'You have a bottle of water. <a href="exec:bottle = 0 & water = 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><b>Drink</b></a>'
 	if buterbrod > 0:pl 'You have a sandwich. <a href="exec:buterbrod = 0 & pcs_energy += 20 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat''"><b>Eat</b></a>'
 	if wine = 1 and alkowine = 0:pl'Your purse contains a bottle of <a href="exec:dynamic $dinalkowin1">wine</a>'

locations/gdksport

@@ -710,28 +710,33 @@ end
 if $ARGS[0] = 'vball5':
 	cla
 	*clr
-	if poverkomand = 0:poverkomand = 600
-	volltime = 0
-	sorevday = daystart
-	if hour < 19: hour = 19
 	timemult = 8
-	loopcount = 1
-	:vballtimeloop5
-	gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop5'
-	loopcount = 0
-	timemult = 0
-	pcs_dom += 1
-	npc_rel['A69'] += 2
-	minut += 120 & !total time should be 4 hours, 2 hours for the game and 2 hours travel
+!	loopcount = 1
+!	:vballtimeloop5
+!	gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
+!	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop5'
+!	loopcount = 0
 	gs 'stat'
 	'<center><img src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
-	'You gathered your things together with the rest of the team and got on a bus that took you to the out of town match.'
-	act 'Play':gt 'gdksport', 'volley'
+	'The tournament starts at 20:00. Your bus departs at 19:00. You gathered your things together with the rest of the team and got on a bus that took you to the out of town match.'
+	act 'Get on bus and go to play':
+		if poverkomand = 0:poverkomand = 600
+		volltime = 0
+		sorevday = daystart
+		if hour < 19: hour = 19 & minut = 0
+		timemult = 0
+		pcs_dom += 1
+		npc_rel['A69'] += 2
+		minut += 60 & !total time should be 4 hours, 2 hours for the game and 2 hours travel
+		gt 'gdksport', 'volley'
+	end
+	act 'Leave':gt 'gdksport', 'start'
 end
 
 if $ARGS[0] = 'volley':
-	minut += 30
+	gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
+	gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
+!	minut += 30
 	gs 'stat'
 
 	if volltime = 0:
@@ -882,7 +887,7 @@ if $ARGS[0] = 'volley':
 				'The match was very close, but in the end your team losses.'
 			end
 		end
-
+		minut += 60 & !total time should be 4 hours, 2 hours for the game and 2 hours travel
 		act 'Leave':gt 'gdksport', 'start'
 		act 'Go to coaching':gt 'Voltrener', 'start'
 	end

locations/gdktoilet

@@ -158,7 +158,7 @@ if $ARGS[0] = 'mens':
 								gs 'stat'
 								'<center><b><font color="maroon">Men''s Room</font></b></center>'
 								'<center><img src="images/pc/fuckoff2.jpg"></center>'
-								'The man backs away from the wall and says, "Why don''t you come over here and we can have some fun." Not wanting to fuck this guy, you quickly get dressed and tell him to fuck Off!'
+								'The man backs away from the wall and says, "Why don''t you come over here and we can have some fun." Not wanting to fuck this guy, you quickly get dressed and tell him to fuck off!'
 								act 'Leave': gt'gdktoilet', 'start'
 							end
 						else
@@ -175,7 +175,7 @@ if $ARGS[0] = 'mens':
 			else
 				pcs_horny += 5
 				gs 'stat'
-				'You look at his naked body and your not sure what''s going on. You decide to leave before things get too awkward.'
+				'You look at his naked body and you''re not sure what''s going on. You decide to leave before things get too awkward.'
 				act 'leave': gt'gdktoilet', 'start'
 			end
 		end
@@ -242,7 +242,7 @@ if $ARGS[0] = 'mens':
 					gs 'stat'
 					'<center><b><font color="maroon">Men''s Room</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/community/bathroom/womens/sex/smiling.jpg"></center>'
-					'You decide to interrupt them and get in on the action. Dimka looks at you smiling and say''s "What the fuck are you interrupting me, get the fuck out." That''s when Dimka slaps you across the face. Your face now all red you quickly leave the restroom and leave.'
+					'You decide to interrupt them and get in on the action. Dimka looks at you smiling and says "What the fuck are you interrupting me, get the fuck out." That''s when Dimka slaps you across the face. Your face now all red you quickly leave the restroom and leave.'
 					act 'Leave': gt'gdktoilet', 'start'
 				end
 			elseif DimaRudeQW > 0:
@@ -307,7 +307,7 @@ if $ARGS[0] = 'mens':
 				act 'Masturbate':
 					cla
 					gs 'stat'
-					'You walk into one of the men''s stalls'
+					'You walk into one of the men''s stalls.'
 					gs 'arousal', 'masturbate', 5
 					gs 'stat'
 					act 'start': gt 'gdktoilet', 'mensmast'
@@ -556,7 +556,7 @@ if $ARGS[0] = 'mensglory':
 										'<center><img src="images/locations/pavlovsk/community/bathroom/mens/sex/misscream.gif"></center>'
 										'You pull off him, getting up and looking down at him. That is when you noticed your pussy dripping cum all over his penis. The man unable to move breathing heavily. The man replies, "I thought it felt better then it should''ve been." '
 										gs 'cuminsidereact'
-										'He continues to breath heavily and says "You were great though, perhaps we''ll meet again." He gets up and gets dressed, that is when you finally notice the other men watching. You quickly get dressed and feel embarrassed you didn''t notice them before, leaving while your blushing.'
+										'He continues to breath heavily and says, "You were great though, perhaps we''ll meet again." He gets up and gets dressed, that is when you finally notice the other men watching. You quickly get dressed and feel embarrassed you didn''t notice them before, leaving while your blushing.'
 										act 'Leave': gt'gdktoilet', 'start'
 									end
 								else
@@ -568,7 +568,7 @@ if $ARGS[0] = 'mensglory':
 										gs 'cum_manage'
 										gs 'stat'
 										'<center><img src="images/shared/sex/cum/cum61.jpg"></center>'
-										'You pull off him, getting up and looking down at him. The man unable to move breathing heavily. He continues to breath heavily and says "You were great, perhaps we''ll meet again." He gets up and gets dressed, that is when you finally notice the other men watching. You quickly get dressed and feel embarrassed you didn''t notice them before, leaving while your blushing.'
+										'You pull off him, getting up and looking down at him. The man unable to move breathing heavily. He continues to breath heavily and says, "You were great, perhaps we''ll meet again." He gets up and gets dressed, that is when you finally notice the other men watching. You quickly get dressed and feel embarrassed you didn''t notice them before, leaving while your blushing.'
 										act 'Leave': gt'gdktoilet', 'start'
 									end
 								end
@@ -635,7 +635,7 @@ if $ARGS[0] = 'emptystall':
 	elseif stat['bj'] >= 1:
 		pcs_horny += 10
 		gs 'stat'
-		'You walk down to the last stall. The large almost perfectly round hole is still there. You wonder how many women used that hole. You feel a little excited as you contemplate your next move.'
+		'You walk down to the last stall. The large almost perfectly round hole is still there. You wonder how many women have used that hole. You feel a little excited as you contemplate your next move.'
 	end
 	if pcs_horny >=40:
 		act 'Caress Yourself':
@@ -1073,9 +1073,9 @@ if $ARGS[0] = 'pussy2':
 		end
 	else
 		if sexcontra = 4:
-			'You pull off of <<$boydesc>> and look at his dick and think "Oh shit! The condom burst."'
+			'You pull off of <<$boydesc>> and look at his dick and think, "Oh shit! The condom burst."'
 		elseif sexcontra = 5:
-			'You pull off of <<$boydesc>> and look at his dick and think "Oh shit! The condom is missing!"'
+			'You pull off of <<$boydesc>> and look at his dick and think, "Oh shit! The condom is missing!"'
 		else
 			'<<$boydesc>> groaned and you realized that he came in the condom.'
 		end

locations/gopsex

@@ -545,6 +545,9 @@ gg_whore_text = RAND(0,7)
 shulga_name_rnd = RAND(0,1)
 	if shulga_name_rnd = 0:$shulga_name_rnd = 'Shulga'
 	if shulga_name_rnd = 1:$shulga_name_rnd = 'Vasily'
+	
+$Shulga_dyn_name = {$dummy[0]='Shulga' & $dummy[1]='Vasily' & $dummy[2]='Vaska' & $dummy[3]='Vasya' & $result=$dummy[RAND(0,3)] & killvar '$dummy'} 
+
 
 gop_name_gg = RAND(0,1)
 	if gop_name_gg = 0:$gop_name_gg = '<<$pcs_nickname>>'
@@ -598,10 +601,9 @@ gop_text_npcr = RAND(1,4)
  	if gop_text_npcr = 2:$gop_text_npcr = 'guys'
  	if gop_text_npcr = 3:$gop_text_npcr = 'buddies'
  	if gop_text_npcr = 4:$gop_text_npcr = 'companions' 	
-gop_name_npc = RAND(1,3)
-	if gop_name_npc = 1:$gop_name_npc = 'Vasya' & $gop_ID_npc = 'A11'
-	if gop_name_npc = 2:$gop_name_npc = 'Vitek' & $gop_ID_npc = 'A9'
-	if gop_name_npc = 3:$gop_name_npc = 'Dan' & $gop_ID_npc = 'A10'
+
+	$gop_name_npc = {dummyi=RAND(0,2) & $dummy[0]='Vasya' & $dummy[1]='Vitek' & $dummy[2]='Dan' & $result=$dummy[dummyi] & $dummy[0]='A11' & $dummy[1]='A9' & $dummy[2]='A10' & $gop_ID_npc=$dummy[dummyi] & killvar '$dummy' & killvar 'dummyi'} 
+
 gop_family_npc = RAND(1,3)
 	if gop_family_npc = 1:$gop_family_npc = 'Shulga'
 	if gop_family_npc = 2:$gop_family_npc = 'Kotov'
@@ -641,17 +643,24 @@ gop_text3 = RAND(0,4)
 	if gop_text3 = 3:$gop_text3 = 'fondle'
 	if gop_text3 = 4:$gop_text3 = 'caress'
 !Buhach	
-gop_text_beer2 = RAND(0,9)
-	if gop_text_beer2 = 0:$gop_text_beer2 = '<<$gop_name_npc>> opened a new bottle of beer, he made a couple of sips and passed the bottle to you. You stayed to drink with the boys.'
-	if gop_text_beer2 = 1:$gop_text_beer2 = '<<$gop_name_npc>> poured beer into an empty glass and handed it to you. You stayed to drink with the guys.'
-	if gop_text_beer2 = 2:$gop_text_beer2 = '<<$gop_name_npc>> handed you a bottle of beer. You took a draught. <<$gop_family_npc>> said loudly, "Drunken slut".'
-	if gop_text_beer2 = 3:$gop_text_beer2 = '<<$gop_name_npc>> uncorked and gave you a can of beer. You eagerly drained it in one gulp. "Wow" <<$gop_text_npcr>> gave a sigh of admiration seeing it.'
-	if gop_text_beer2 = 4:$gop_text_beer2 = '<<$gop_name_npc>> took a flask, poured beer into a glass, and handed it to you. You sat down on the bench and sprawled leisurely boozing with chavs.'
-	if gop_text_beer2 = 5:$gop_text_beer2 = '<<$gop_name_npc>> opened a bottle of beer and handed it to you. You sipped beer slowly.'
-	if gop_text_beer2 = 6:$gop_text_beer2 = '<<$gop_name_npc>> uncorked a bottle of beer and gave it to you. You eagerly drained it and plopped the empty bottle on the bench.'
-	if gop_text_beer2 = 7:$gop_text_beer2 = '<<$gop_name_npc>> took a sip from a big PET-bottle and handed it to you. You took few gulps and <<$gop_family_npc>> took the bottle from you.'
-	if gop_text_beer2 = 8:$gop_text_beer2 = '<<$gop_name_npc>> took a sip from a can and handed it to you. You began eagerly swig the beer... <<$gop_family_npc>> took the can away from you "Fuck, let some for us, fool!"'
-	if gop_text_beer2 = 9:$gop_text_beer2 = '"Have one." <<$gop_name_npc>> handed you a bottle of unfinished Zhiguli and he smirked seeing as you drank it eagerly. Your mood lightened.'
+
+$gop_text_beer2 = {
+	dummyi = RAND(0,9)
+	if dummyi = 0:$dummy = dyneval($gop_name_npc)+' opened a new bottle of beer, he made a couple of sips and passed the bottle to you. You stayed to drink with the boys.'
+	if dummyi = 1:$dummy = dyneval($gop_name_npc)+' poured beer into an empty glass and handed it to you. You stayed to drink with the guys.'
+	if dummyi = 2:$dummy = dyneval($gop_name_npc)+' handed you a bottle of beer. You took a draught. <<$gop_family_npc>> said loudly, "Drunken slut".'
+	if dummyi = 3:$dummy = dyneval($gop_name_npc)+' uncorked and gave you a can of beer. You eagerly drained it in one gulp. "Wow" <<$gop_text_npcr>> gave a sigh of admiration seeing it.'
+	if dummyi = 4:$dummy = dyneval($gop_name_npc)+' took a flask, poured beer into a glass, and handed it to you. You sat down on the bench and sprawled leisurely boozing with chavs.'
+	if dummyi = 5:$dummy = dyneval($gop_name_npc)+' opened a bottle of beer and handed it to you. You sipped beer slowly.'
+	if dummyi = 6:$dummy = dyneval($gop_name_npc)+' uncorked a bottle of beer and gave it to you. You eagerly drained it and plopped the empty bottle on the bench.'
+	if dummyi = 7:$dummy = dyneval($gop_name_npc)+' took a sip from a big PET-bottle and handed it to you. You took few gulps and <<$gop_family_npc>> took the bottle from you.'
+	if dummyi = 8:$dummy = dyneval($gop_name_npc)+' took a sip from a can and handed it to you. You began eagerly swig the beer... <<$gop_family_npc>> took the can away from you "Fuck, let some for us, fool!"'
+	if dummyi = 9:$dummy = '"Have one." '+dyneval($gop_name_npc)+' handed you a bottle of unfinished Zhiguli and he smirked seeing as you drank it eagerly. Your mood lightened.'
+	$result = $dummy
+	killvar 'dummyi'
+	killvar '$dummy'
+}
+
 gop_beer_drova = RAND (0,8)
 	if gop_beer_drova = 0:$gop_beer_drova = '"<<$gop_gg_name>>, you drank all the beer! Get up, let''s <<$gop_sextext1>> you!"'
 	if gop_beer_drova = 1:$gop_beer_drova = '"You drank up all our beer, <<$gop_gg_name>>!, Get up, it''s time to work off your share."'
@@ -977,7 +986,7 @@ if $ARGS[0] = 'gopsex_select':
 	  if pcs_horny <50 and PCloStyle ! 4: '<center><img src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/b'+rand(1,17)+'.jpg"></center> <br> You want sex.'
 	  if pcs_horny >=50 and PCloStyle ! 4: '<center><img src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/g'+rand(1,20)+'.jpg"></center> <br> You overexcited and strongly want to fuck.'
 	  if PCloStyle = 4: '<center><img src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/h'+rand(1,17)+'.jpg"></center>'
-	  act 'Have sex with Vasya': 
+	  act 'Have sex with '+dyneval($Shulga_dyn_name): 
 		if shgopsex_vasya_count <= 0:
 			cla
 			'Vasya said: "<<$gop_name_gg>>, you fucked with me already, it''s enough fun for today, don''t bother."'
@@ -988,6 +997,7 @@ if $ARGS[0] = 'gopsex_select':
 			shgopsex_vasya_day = daystart
 			shgopsex_vasya_count -= 1
 			if npcSex[11] = 0:npcSex[11] = 1 & guy += 1
+			$gop_ID_npc = 'A11'
 			gs 'gopsex', 'shgopsex'
 		end
 	  end
@@ -1003,6 +1013,7 @@ if $ARGS[0] = 'gopsex_select':
 				shgopsex_den_day = daystart
 				shgopsex_den_count -= 1		
 				if npcSex[10] = 0:npcSex[10] = 1 & guy += 1
+				$gop_ID_npc = 'A10'
 				gs 'gopsex', 'shgopsex'
 			end
 		end
@@ -1017,6 +1028,7 @@ if $ARGS[0] = 'gopsex_select':
 				shgopsex_vitya_day = daystart
 				shgopsex_vitya_count -= 1
 				if npcSex[9] = 0:npcSex[9] = 1 & guy += 1
+				$gop_ID_npc = 'A9'
 				gs 'gopsex', 'shgopsex'
 			end
 		end	

locations/obj_din

@@ -1347,7 +1347,7 @@ if $ARGS[0] = 'clothes':
 		view FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
 		if PClobimbo = 1:pl 'You are dressed like a bimbo.'
 
-		pl 'You are wearing ' + FUNC('$short_description', $clothingworntype, PClostyle2) + '<<clothingwornnumber>>.'
+		pl 'You are wearing ' + FUNC('$short_description', $clothingworntype, PCloStyle2) + '<<clothingwornnumber>>.'
 
 		if $clothingworntype ! 'coat' and $clothingworntype ! 'swimwear':
 			gs 'clothing_attributes', $clothingworntype, clothingwornnumber

locations/seeporn

@@ -179,7 +179,7 @@ act 'watch porn':
 
 						gs 'stat'
 						'<center><img src="images/shared/sex/cum/facial/facial22.jpg"></center>'
-						'Suddenly, your brother takes his dick out of your mouth and a jet of hot cum slaps you in the face. Mishan laughs "Kolka, you just fucked your sister in the mouth. Fuck!" Kolka wiping the sweat from his forehead says "Holy fuck, I don''t fucking believe it. She asked for it, the slut. Noone could have resisted."'
+						'Suddenly, your brother takes his dick out of your mouth and a jet of hot cum slaps you in the face. Mishan laughs "Kolka, you just fucked your sister in the mouth. Fuck!" Kolka wiping the sweat from his forehead says "Holy fuck, I don''t fucking believe it. She asked for it, the slut. No one could have resisted."'
 
 						act 'Leave':gt 'gschool_grounds', 'sports'
 					end

locations/shulga_room

@@ -786,7 +786,7 @@ if $ARGS[0] = 'shulga_beer':
 		pcs_breath = 0
 		gs'stat'
 		'<center><img src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer'+rand(1,8)+'.jpg"></center>'
-		'<<$gop_text_beer2>>'
+		dyneval($gop_text_beer2)
 
 		act 'Have another drink': gt 'shulga_room', 'shulga_beer'
 		act 'You''ve had enough': gt 'shulga_room', 'start'