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

locations/anushapt

@@ -397,6 +397,8 @@ if $ARGS[0] = 'computer':
 				'While browsing her huge list of porno''s, you find one that you like and lean back in the chair and start masturbating. Before long you completely forget that you are in someone else''s bedroom masturbating to their porn on their laptop.'
 				gs 'arousal', 'voyeur', 10, 'unknown'
 				act 'Continue':
+					*clr
+					cla
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushcmast.mp4"></video></center>'
 					'You keep rubbing your clit, you can feel your climax building and building. You are sure you are almost there.'

locations/foto

@@ -932,9 +932,9 @@ $metkaM = 'makeup'
 '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 'The backstage area where you and the other girls put on your makeup.'
 	act'Back to the studio':gt'foto','studio'
-	
+
 	if pcs_hairbsh = 0 and pcs_makeup = 1:
-		act'Do the works':
+		act'Brush your hair and do your makeup for modelling':
 			*clr & cla
 			if player_avatar = 1:
 				'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
@@ -942,49 +942,53 @@ $metkaM = 'makeup'
 				'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 			end
 			if pcs_mdlng < 20:
+				minut += 2
+				mdlng_exp += 1
+				pcs_hairbsh = 1
+				pcs_makeup = 2
+				pcs_lipbalm += 8
 				'	You pick up the brush on the table of your station and work it through your hair until it shines and apply the subtle makeup typical of models that covers any and all of your slight imperfections.'
 				'	You apply some lip gloss for that perfect finishing touch.'
-				minut += 2
 				act 'View results':gt'foto','makeup'
 			else
-			'	You do your hair and makeup swiftly and flawlessly. You''re basically a pro at this part of modelling now.'
 				minut += 1
+				mdlng_exp += 1
 				pcs_hairbsh = 1
 				pcs_makeup = 2
 				pcs_lipbalm += 8
+			'	You do your hair and makeup swiftly and flawlessly. You''re basically a pro at this part of modelling now.'
 				act 'View results':gt'foto','studio'
 			end
 		end
-	end
-	
-	if pcs_hairbsh = 0:
-		act'Brush your hair':
-			*clr & cla
-			if player_avatar = 1:
-				'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+	else
+		if pcs_hairbsh = 0:
+			act'Brush your hair':
+				*clr & cla
+				if player_avatar = 1:
+					'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+				end
+				'	You pick up the brush on the table of your station and work it through your hair until it shines.'
+				minut += 1
+				pcs_hairbsh = 1
+				act 'View results':gt'foto','makeup'
 			end
-			'	You pick up the brush on the table of your station and work it through your hair until it shines.'
-			minut += 1
-			pcs_hairbsh = 1
-			act 'View results':gt'foto','makeup'
 		end
-	end
-	
-	if pcs_makeup = 1:
-		act'Apply makeup and lip gloss':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/pc/mop.jpg"></center>'
-			'	You apply the subtle makeup typical of models that covers any and all of your slight imperfections. It''s important that you don''t look overdone. People need to think you''re still a real person at a glance.'
-			'	You apply some lip gloss for that perfect finishing touch.'
-			minut += 1
-			pcs_makeup = 2
-			pcs_lipbalm += 8
-			act 'View results':gt'foto','makeup'
+
+		if pcs_makeup = 1:
+			act'Apply makeup and lip gloss ready for modelling':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/pc/mop.jpg"></center>'
+				'	You apply the subtle makeup typical of models that covers any and all of your slight imperfections. It''s important that you don''t look overdone. People need to think you''re still a real person at a glance.'
+				'	You apply some lip gloss for that perfect finishing touch.'
+				minut += 1
+				pcs_makeup = 2
+				pcs_lipbalm += 8
+				act 'View results':gt'foto','makeup'
+			end
 		end
-	end
-	
+
 	act 'Go to the showers':gt'foto','showers'
 end
 

locations/lug

@@ -142,56 +142,37 @@ if $ARGS[0] = 'prut2':
 	end
 
 	if temper >= 15 and month >= 5 and month <= 9:
-		if pcs_exhibition > 30 and pcs_horny >= 80:
+		if pcs_exhibition > 30:
 			act 'Strip off and skinny dip (1:00)':
 				cla
 				*clr
 				cumspclnt = 4
 				gs 'cum_cleanup'
-				minut = minut + 60
+				minut += 60
 				pcs_sweat = 10 + rand(0,4)
 				pcs_mood += 5
-				pcs_willpwr = pcs_willpwr + 5
 				if pcs_stren < 30: stren_exp += 1
+				exhibition_exp += 4
 				gs 'clothing', 'strip'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
-				'You strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
-				'You play around and have fun in the pond, enjoying the feel of the warm water on your naked body. The clean pond water refreshes and invigorates you.'
-				act'Get out and dress':gt 'lug', 'prut2'
-			end
-		elseif pcs_exhibition >= 40:
-			act 'Strip off and skinny dip (1:00)':
-				cla
-				*clr
-				cumspclnt = 4
-				gs 'cum_cleanup'
-				minut = minut + 60
-				pcs_sweat = 10 + rand(0,4)
-				pcs_mood += 5
-				pcs_willpwr = pcs_willpwr + 5
-				if pcs_stren < 30: stren_exp += 1
-				gs 'clothing', 'strip'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
-				'Not caring if anyone is looking at you, you slowly take off your clothes.  You peel off each item like a stripper. You feel so naughty. Soon, you completely naked.'
-				'You play around and have fun in the pond, enjoying the feel of the warm water on your naked body. The clean pond water refreshes and invigorates you.'
-				act'Get out and dress':gt 'lug', 'prut2'
-			end
-		elseif pcs_exhibition > 30:
-			act 'Strip off and skinny dip (1:00)':
-				cla
-				*clr
-				cumspclnt = 4
-				gs 'cum_cleanup'
-				minut = minut + 60
-				pcs_sweat = 10 + rand(0,4)
-				pcs_mood += 5
-				pcs_willpwr = pcs_willpwr + 5
-				if pcs_stren < 30: stren_exp += 1
-				gs 'clothing', 'strip'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
-				'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes.'
-				'You play around and have fun in the pond, enjoying the feel of the warm water on your naked body. The clean pond water refreshes and invigorates you.'
-				act'Get out and dress':gt 'lug', 'prut2'
+				gs 'underwear', 'remove'
+				if pcs_horny >= 80:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
+					'AS you strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you and carry on stripping.'
+					'Once you are naked you play around and have fun in the pond, enjoying the feel of the warm water on your body. The clean pond water refreshes and invigorates you.'
+				elseif pcs_exhibition >= 40:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+					'Not caring if anyone is looking at you, you slowly take off your clothes.  You peel off each item like a stripper. You feel so naughty. Soon, you completely naked.'
+					'You play around and have fun in the pond, enjoying the feel of the warm water on your naked body. The clean pond water refreshes and invigorates you.'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+					'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes.'
+					'You play around and have fun in the pond, enjoying the feel of the warm water on your naked body. The clean pond water refreshes and invigorates you.'
+				end
+				act'Get out and dressed':
+					gs 'underwear', 'wear'
+					gs 'clothing', 'wear_last_worn'
+					gt 'lug', 'prut2'
+				end
 			end
 		else
 			'It would be a good place for skinny dipping but you''re too worry about what people would think to do such a thing.'