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

locations/anushapt

@@ -73,7 +73,7 @@ if $ARGS[0] = 'home':
 		nushdoor = RAND(1,10)
 		if nushdoor = 1:
 			*clr & cla
-			AnushkaLoc = 7:
+			AnushkaLoc = 7
 			'You stand outside the Konstantinov household, waiting for Anushka to come open the door.'
 			'Maksim answers the door instead, he looks you over from head to toe, obviously still trying to imagine you naked. "What?" He asks.'
 			'You ignore his look. "Is Anushka home?"'
@@ -1663,7 +1663,7 @@ if $ARGS[0] = 'nushshower':
 	$locM = 'anushapt'
 	gs 'stat'
 	$location_type = 'bathroom'
-	AnushkaLoc = 7:
+	AnushkaLoc = 7
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/dry1.jpg"></center>'
 	'As you approach the bathroom you can hear the water running. Checking the door you find the latch still broke, as you open the door and walk in, the water turns off. You look around and see that the bathroom has seen better days. There''s some mold in the corners of the walls and floors and the place probably hasn''t been cleaned for quite some time. The toilet sits along the far wall. There''s also a bathtub, with an old plastic shower curtain hanging from a rod above it. Anushka peeks out from around the curtain and when she see''s it''s you, she pushes it aside and grabs a towel. "Oh hey <<$pcs_nickname>>, what''s up?"'

locations/barbershop

@@ -165,7 +165,7 @@ if barbershop_wrk = 0:
 		end
 	end
 elseif barbershop_wrk = 1 and barbershop_wrk_day ! daystart:
-	act 'Get to work (1h)':
+	act 'Clean the shop for 90 <b>₽</b> (1:00)':
 		cla
 		*clr
 		minut += 60

locations/belpicknick

@@ -32,7 +32,7 @@ if $ARGS[0] = '1':
 		cls
 		minut += 5
 		gs'stat'
-		if pcs_danc < 60:
+		if pcs_danc < 40:
 			'You know this is your cue, and you attempt to do a striptease for them. You would have to be very good at dancing to overcome you drunkenness and begin to dance a bit awkwardly, tugging at your clothes.'
 			'The criminals are not impressed in the slightest, and one of them yells: "What kind of crap is this!? My elderly aunt Katinka could do a better job!"'
 			'His friend agrees: "Yea, this is fucking terrible!"'
@@ -42,7 +42,7 @@ if $ARGS[0] = '1':
 			act'Shove the neck into your ass':gt 'belpicknick', 'ab_light'
 			act'Shove the bottom into your ass':gt 'belpicknick', 'ab_hard'
 		end
-		if pcs_danc >= 60:gt 'belpicknick', 'dance'
+		if pcs_danc >= 40:gt 'belpicknick', 'dance'
 	end
 end
 
@@ -133,10 +133,10 @@ if $ARGS[0] = 'dance':
 		gs 'belpicknick', 'vibor'
 		if rand(0,1) = 0:
 			'Suddenly the cock you''re currently sucking on is pulled away from you, and <<$boydesc>> pushes you onto your back saying he wants to try another hole now.'
-			belsexpayment += 200
+			belsexpayment += 25
 			act'Lie on your back':gt 'belpicknick', 'missionary'
 		else
-			belsexpayment += 200
+			belsexpayment += 25
 			'Suddenly the cock you''re currently sucking on is pulled away from you, and <<$boydesc>> tells you to get on all fours saying he wants to try another hole now.'
 			act'Get on your hands and knees':gt 'belpicknick', 'doggy'
 		end

locations/clener

@@ -236,7 +236,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if clener > 1 and clenday ! daystart:
-		act 'Mop the floor in the office (1:00)':
+		act 'Mop the floor in the office for 65 <b>₽</b> (1:00)':
 			cla
 			*clr
 			clenday = daystart
@@ -303,7 +303,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if clenerT >= 1 and clendayT ! daystart:
-		act 'Clean toilets (1:00)':
+		act 'Clean toilets for 65 <b>₽</b> (1:00)':
 			cla
 			*clr
 			clendayT = daystart

locations/gpoli

@@ -48,7 +48,7 @@ if $ARGS[0] = '':
 				act 'Leave':gt 'gpoli'
 			end
 		elseif gpoliuborka > 1 and hour >= 14 and hour <= 21 and gpolicleanday ! daystart:
-			act 'Work as a cleaner (1:00)':
+			act 'Work as a cleaner for 50 <b>₽</b> (1:00)':
 				cla
 				*clr
 				gpolicleanday = daystart

locations/lake

@@ -24,9 +24,9 @@ if $ARGS[0] = 'start':
 
 	'A large lake close to the city, it is a favorite destination of residents in the summer.'
 	if $clothingworntype ! 'swimwear':
-		'There is a winding <a href="exec:GT ''dort'',''start''">path</a> leading to the railway station.'
+		'There is a winding <a href="exec:GT ''dort'',''start''">path</a> leading to the railway station in the city industrial region.'
 	else
-		'You can see the winding path to the railway station, you should get properly dressed if you want to go there.'
+		'You can see the winding path to the railway station in the city industrial region, you should get properly dressed if you want to go there.'
 	end
 
 	if car > 0 and cardrive = 4:
@@ -48,6 +48,7 @@ if $ARGS[0] = 'start':
 			act 'Walk on the beach':
 				cls
 				minut += 60
+				pcs_mood += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake.jpg"></center>'
 				'You walk along the shore.'

locations/postdeliveries

@@ -1351,8 +1351,8 @@ if $ARGS[0] = 'finishround':
 !! possible responses to what happened during your round
 	if posteventQW4 = 1:posteventQW4 = 2 & '"One missing signatu- oh never mind, it''s him!" the postmaster remarks dryly when he notices the missing signature of the pervert who tried to to blackmail you. "No need to explain. I hope you didn''t listen to him? He tries that with every girl we hire. I''ve reported him to captain Katalkin several times, but nothing ever happens..."'
 	if postjobQW ! 999:
-		money += 750
-		'You receive your pay for the day, 750 rubles.'
+		money += 450
+		'You receive your pay for the day, 450 rubles.'
 	end
 	if postjobQW = 999: '"I better let Aleksiy know he needs to come in again on Saturdays, from now on. I knew I shouldn''t have trusted you!" he sighs, shaking his head in disappointment as he walks off. Guess you''re not getting paid for the day...'
 !! actions after your round is finished, default plus options if a long scene was triggered during your round