Browse Source

Price changes and some text edits/fixes from nutluck and blatte

KevinSmarts 6 years ago
parent
commit
ad3a4aa53b
8 changed files with 194 additions and 224 deletions
  1. 3 3
      locations/Gshveyfab
  2. 17 17
      locations/barbershop
  3. 8 8
      locations/clener
  4. 12 12
      locations/gadmarket
  5. 29 15
      locations/rinok
  6. 92 138
      locations/salon
  7. 32 30
      locations/shop
  8. 1 1
      locations/vokzalGin

+ 3 - 3
locations/Gshveyfab

@@ -98,7 +98,7 @@ CLOSE ALL
 			if smenaFabrika < 0:
 				smenaFabrika = 0
 			end
-			pay = smenaFabrika * 400
+			pay = smenaFabrika * 420
 			karta += pay
 			smenaFabrika = 0
 			workFabrika = 0 
@@ -119,7 +119,7 @@ if $ARGS[0] = 'job_start':
 	''
 	'You go to the factory foreman, Stepan Sergeyevich, and ask for a job.'
 	if age >= 16 and age < 18 and workFabrika = 0:
-		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Since you are not an adult yet, you can only work half-time, and the pay is 100 <b>₽</b> per hour. Once you become an adult, we can transfer you to full-time. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 8:00 to 16:00, but you will be working the second shift, from 16:00 to 20:00. And if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
+		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Since you are not an adult yet, you can only work half-time, and the pay is 105 <b>₽</b> per hour. Once you become an adult, we can transfer you to full-time. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 8:00 to 16:00, but you will be working the second shift, from 16:00 to 20:00. And if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
 			act 'Take the job':
 				cla
 				minut += 10
@@ -133,7 +133,7 @@ if $ARGS[0] = 'job_start':
 				act 'Leave':gt'Gshveyfab', 'enter'
 			end	
 	elseif age >= 18 and workFabrika = 0:
-		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 8:00 to 16:00, and the pay is 100 <b>₽</b> per hour. And if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month, and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
+		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 8:00 to 16:00, and the pay is 105 <b>₽</b> per hour. And if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month, and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
 			act 'Take the job':
 				cla
 				minut += 10

+ 17 - 17
locations/barbershop

@@ -63,7 +63,7 @@ if $ARGS[0] = 'start':
 	if pcs_hairlng <= 15:
 		'Your hair is not long enough to require cutting.'
 	else
-		'<a href=' + iif(money >= 500, '"exec:gt ''barbershop'', ''cuthair''"', '') + '>Cut your hair - 500 <b>₽</b></a>'
+		'<a href=' + iif(money >= 700, '"exec:gt ''barbershop'', ''cuthair''"', '') + '>Cut your hair - 700 <b>₽</b></a>'
 	end
 
 	*nl
@@ -71,7 +71,7 @@ if $ARGS[0] = 'start':
 	if pcs_hairlng <= 80:
 		'Your hair is not long enough to be curled.'
 	else
-		'<a href=' + iif(money >= 300, '"exec:gt ''barbershop'', ''perm''"','') + '>Curl your hair - 300 <b>₽</b></a>'
+		'<a href=' + iif(money >= 1500, '"exec:gt ''barbershop'', ''perm''"','') + '>Curl your hair - 1500 <b>₽</b></a>'
 	end
 	
 	*nl
@@ -79,7 +79,7 @@ if $ARGS[0] = 'start':
 	if pcs_hairlng <= 80:
 		'Your hair is not long enough to be straightened.'
 	else
-		'<a href=' + iif(money >= 300, '"exec:gt ''barbershop'', ''perm2''"', '') + '>Straighten your hair - 300 <b>₽</b></a>'
+		'<a href=' + iif(money >= 1500, '"exec:gt ''barbershop'', ''perm2''"', '') + '>Straighten your hair - 1500 <b>₽</b></a>'
 	end
 	
 	*nl
@@ -145,7 +145,7 @@ if barbershop_wrk = 0:
 		'You smile cheerfully. "That sound great! What would I have to do?"'
 		'"Well," he says, while looking around and gathering tasks for you. "...,  you''d have to mop the floor here in the main room and the break room in the back as well. Take out all the trash, clean the breakroom kitchen, clean the mirrors, windows, chairs and toilet and of course dust the shelves. It might sound like a lot, but don''t worry, even doing one thing, makes my life easier."'
 		'You think about it for a second, but you guess it won''t be too bad and you could need any amount of money... "I...uhm...hate to ask, but how much would I earn per hour?"'
-		'"Ah yes," Mr. Syomin chuckles. "..., the most important question. Are you alright with 100 <b>₽</b> per hour?"'
+		'"Ah yes," Mr. Syomin chuckles. "..., the most important question. Are you alright with 90 <b>₽</b> per hour?"'
 			
 		act 'Accept the job':
 			cla
@@ -169,10 +169,10 @@ elseif barbershop_wrk = 1 and barbershop_wrk_day ! daystart:
 		cla
 		*clr
 		minut += 60
-		money += 100
+		money += 90
 		barbershop_wrk_day = daystart
 		gs 'stat'
-		'You work diligently and fast. You clean the floor, take out the trash, dust off the shelves and wipe some mirrors and windows. Before you know an hour has passed and you''re 100 <b>₽</b> richer.'
+		'You work diligently and fast. You clean the floor, take out the trash, dust off the shelves and wipe some mirrors and windows. Before you know an hour has passed and you''re 90 <b>₽</b> richer.'
 
 		act 'Leave': gt 'barbershop','start'
 	end
@@ -189,7 +189,7 @@ if $ARGS[0] = 'cuthair':
 		act 'Very short':
 			cla
 			*clr
-			money -= 500
+			money -= 700
 			'You sit down and say, "I want my hair to be very short."'
 			'"Of course", he says with a friendly smile on her face, while leading you to a free seat.'
 
@@ -211,7 +211,7 @@ if $ARGS[0] = 'cuthair':
 		act 'Short, but not too short':
 			cla
 			*clr
-			money -= 500
+			money -= 700
 			'"I''d like to have my hair cut short, but it shouldn''t get too short. I hope, you know what I mean.", you tell him, hoping he wouldn''t cut everything off.'
 			'"I know what you mean, that''s not problem at all", he says, then he turns around one of the free seats and makes a gesture to you, to sit down.'
 
@@ -268,7 +268,7 @@ if $ARGS[0] = 'cuthair':
 		act 'About chin-line length':
 			cla
 			*clr
-			money -= 500
+			money -= 700
 			'"Could you cut my hair back to between my chin and shoulder, please?", you ask him.'
 			'"Sure, no problem", he tells you getting a chair for you ready.'
 
@@ -325,7 +325,7 @@ if $ARGS[0] = 'cuthair':
 		act 'Shoulder Length':
 			cla
 			*clr
-			money -= 500
+			money -= 700
 			'"I would like to have my hair cut back to about the height of my shoulder.", you tell him.'
 			'"Sure, no problem", he tells you, gesturing you, to sit down into a free chair.'
 
@@ -382,7 +382,7 @@ if $ARGS[0] = 'cuthair':
 		act 'About Brastrap length':
 			cla
 			*clr
-			money -= 500
+			money -= 700
 			'"Could you cut my hair back to about where my bra-strap sits?", you ask him.'
 			'"That''s absolutely no problem.", he says, when gesturing you sit down on one of the free seat'
 
@@ -436,10 +436,10 @@ if $ARGS[0] = 'cuthair':
 	end
 
 	if pcs_hairlng > 401:
-		act 'About Back length':
+		act 'About small of back length':
 			cla
 			*clr
-			money -= 500
+			money -= 700
 			'"Could you cut my hair back to about the small of my back?", you ask him.'
 			'"That''s absolutely no problem.", he says, when gesturing you sit down on one of the free seat'
 
@@ -496,7 +496,7 @@ if $ARGS[0] = 'cuthair':
 		act 'About Hip length':
 			cla
 			*clr
-			money -= 500
+			money -= 700
 			'"Could you cut my hair back to about the top of my hips?", you ask him.'
 			'"That''s absolutely no problem.", he says, when gesturing you sit down on one of the free seat'
 
@@ -553,7 +553,7 @@ if $ARGS[0] = 'cuthair':
 		act 'Cut the tips':
 			cla
 			*clr
-			money -= 500
+			money -= 700
 			'"I''d like to keep this length, but my tips might need some cutting. Could you do that?", you ask him. '
 			'"Of course, please sit down.", he says.'
 
@@ -613,7 +613,7 @@ if $ARGS[0] = 'perm':
 	cla
 	*clr
 	minut += 20
-	money -= 300
+	money -= 1500
 	if defcurly = 0:
 		curly = rand(12,16)
 		gs 'stat'
@@ -632,7 +632,7 @@ if $ARGS[0] = 'perm2':
 	cla
 	*clr
 	minut += 20
-	money -= 300
+	money -= 1500
 	curly = 0
 	if defcurly = 0:
 		gs 'stat'

+ 8 - 8
locations/clener

@@ -205,7 +205,7 @@ if $ARGS[0] = 'start':
 	if clener >= 10 and clenerT = 0:
 		act 'Ask for more work':
 			cla
-			'You ask Boris Ivanovich whether he has more work for you. He says that he needs a cleaner to clean the toilets. You''ll be almost able to work every day. Cleaning toilets for an hour earns you 100 <b>₽</b> upfront.'
+			'You ask Boris Ivanovich whether he has more work for you. He says that he needs a cleaner to clean the toilets. You''ll be almost able to work every day. Cleaning toilets for an hour earns you 65 <b>₽</b> upfront.'
 
 			act 'Refuse and leave':gt 'street'
 
@@ -222,7 +222,7 @@ if $ARGS[0] = 'start':
 	if clener = 1:
 		act 'Ask about available jobs':
 			cla
-			'You head into the office that advertised the job. You see a large man in a jacket sitting there. He tells you can clean the Office for 100 <b>₽</b> per hour, payed upfront.'
+			'You head into the office that advertised the job. You see a large man in a jacket sitting there. He tells you can clean the Office for 200 <b>₽</b> per hour, payed upfront.'
 
 			act 'Refuse and leave':gt 'street'
 
@@ -244,7 +244,7 @@ if $ARGS[0] = 'start':
 			minut += 60
 			clener += 1
 			pcs_mood -= 15
-			money += 100
+			money += 65
 			pcs_sweat += 20
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 
@@ -270,7 +270,7 @@ if $ARGS[0] = 'start':
 						cla
 						jouryQwNo = 1
 						'You look angerly at him, "No, I don''t mix business with pleasure..." Yuri looks dejected as he moves away from you.'
-						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 100 <b>₽</b> for the work.'
+						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
 						act 'Leave':gt 'clener', 'start'
 					end
@@ -280,7 +280,7 @@ if $ARGS[0] = 'start':
 						minut += 15
 						gs 'stat'
 						'You smile and nod. Yuri says that he''s just about to finish and will meet you at the entrance of the building.'
-						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 100 <b>₽</b> for the work.'
+						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 						'As you leave, you notice Yuri awiting you. He''s pretty nervous and it seems as if he doesn''t know what to do. Not knowing what to say, he blurts out, "How about we head over to my place, watch some movies, drink champagne and talk."'
 
 						act 'No':jouryQwNo = 1 & gt 'clener', 'start'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'start':
 
 			if hour < 9 or hour > 16:'The office is empty of people, you quietly wash the floor and wipe the floor in the office.'
 
-			'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 100 <b>₽</b> for the work.'
+			'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
 			act 'Leave':gt 'clener', 'start'
 		end
@@ -311,7 +311,7 @@ if $ARGS[0] = 'start':
 			minut += 60
 			clenerT += 1
 			pcs_mood -= 25
-			money += 100
+			money += 65
 			pcs_sweat += 30
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener2.jpg"></center>'
 
@@ -338,7 +338,7 @@ if $ARGS[0] = 'start':
 						sub += 1
 						jouryResult = 10
 						'Yuri only sees you as a simple fuck whore. But you''re willing to put up with it and agree to visit him afterwards. Yuri nods in satisfaction and leaves the toilet.'
-						'You continue on by mopping the floor and polish the toilets and urinals. You are given 100 <b>₽</b> for your work.'
+						'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
 
 						act 'Leave':gt 'clener', 'start'
 					end

+ 12 - 12
locations/gadmarket

@@ -7,24 +7,24 @@ set minut += 5
 *pl '<center><h1><font color="maroon">Village Shop</font></h1></center>'
 *pl '<center><img <<$set_imgh>> src="images/locations/gadukino/village/market.jpg"></center>'
 
-'You walk into the small shop with four narrow aisles with chest high shelves crammed full of food and other household goods.  There is little variety in the selections, just the essentials.'
+'You walk into the small shop with four narrow aisles with chest high shelves crammed full of food and other household goods. There is little variety in the selections, just the most essential products.'
 'Slowly you browse the aisles looking for something to buy.'
 *nl
-'Next to the clerk is a rack full of magazines, cigarettes, and a few hygienic items.'
+'As you approach the teller, you notice a rack full of magazines, cigarettes, and a few hygienic items.'
 *nl
 
 $gadmarkettab = '<center><table align="center">'
-$gadmarkettab += FUNC ('$stock_item', 10, 'Package of Cookies', 300, 'pranik', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 20, 'Cigarettes', 50, 'siga', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Fashion magazine', 50, 'fashmag', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Computer magazine', 50, 'compmag', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Biographical magazine', 50, 'biomag', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 50, 'cookmag', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Knitting magazine', 50, 'knitmag', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 5, 'condoms', 100, 'prezik', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 10, 'Package of Cookies', 400, 'pranik', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 20, 'Cigarettes', 150, 'siga', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Fashion magazine', 450, 'fashmag', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Computer magazine', 450, 'compmag', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Biographical magazine', 450, 'biomag', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 450, 'cookmag', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Knitting magazine', 450, 'knitmag', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 5, 'condoms', 600, 'prezik', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'tampon', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 200, 'buterbrod', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of wine', 200, 'wine', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of wine', 700, 'wine', 'gadmarket')
 $gadmarkettab += '</table></center>'
 *pl $gadmarkettab
 killvar '$gadmarkettab'

+ 29 - 15
locations/rinok

@@ -31,13 +31,13 @@ if $ARGS[0] = 'start' or $metka = 'start':
 		''
 	end	
 	*pl '<center><table align="center" width=80%>' 
-	*P FUNC ('$stock_item', 10, 'Dishwashing detergent', 45, 'fairy', 'rinok')
-	*P FUNC ('$stock_item', 10, 'Clothing detergent', 90, 'poroshok', 'rinok')
-	*P FUNC ('$stock_item', 8, 'Plates', 500, 'cltarelka', 'rinok')
-	*P FUNC ('$stock_item', 20, 'Cosmetics', 380, 'kosmetica', 'rinok')
-	*P FUNC ('$stock_item', 5, 'Razors', 200, 'stanok', 'rinok')
-	*P FUNC ('$stock_item', 10, 'Tampons', 120, 'tampon', 'rinok')
-	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 120, 'sanpad', 'rinok')
+	*P FUNC ('$stock_item', 10, 'Dishwashing detergent', 400, 'fairy', 'rinok')
+	*P FUNC ('$stock_item', 10, 'Clothing detergent', 400, 'poroshok', 'rinok')
+	*P FUNC ('$stock_item', 8, 'Plates', 450, 'cltarelka', 'rinok')
+	*P FUNC ('$stock_item', 20, 'Cosmetics', 1000, 'kosmetica', 'rinok')
+	*P FUNC ('$stock_item', 5, 'Razors', 800, 'stanok', 'rinok')
+	*P FUNC ('$stock_item', 10, 'Tampons', 160, 'tampon', 'rinok')
+	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, 'sanpad', 'rinok')
 	*P iif(umbrella = 0, FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'rinok'), '')
 	'</table></center>'
 	*pl
@@ -123,29 +123,43 @@ if $ARGS[0] = 'start' or $metka = 'start':
 
 		'On the counter is a very entertaining fantasy book, that is all 150 <b>₽</b> and women''s novels are in paperback standing 300 <b>₽</b>.'
 
-		if money >= 150:
-			act 'Buy a book of fantasy 150r':
+		if money >= 350:
+			act 'Buy a book of fantasy 350r':
 				cls
 				minut += 15
-				money -= 150
+				money -= 350
 				f_book += 1
 				gs'stat'
 
-				'You bought the book for fantasy 150 <b>₽</b>.'
+				'You bought the book for fantasy 350 <b>₽</b>.'
+
+				act 'Leave':gt'rinok','start'
+			end
+		end
+		
+		if money >= 350:
+			act 'Buy a book of science fiction 350r':
+				cls
+				minut += 15
+				money -= 350
+				f_book += 1
+				gs'stat'
+
+				'You bought the book for science fiction 350 <b>₽</b>.'
 
 				act 'Leave':gt'rinok','start'
 			end
 		end
 
-		if money >= 300:
-			act 'Buy ladies for romance 300r':
+		if money >= 350:
+			act 'Buy ladies for romance 350r':
 				cls
 				minut += 15
-				money -= 300
+				money -= 350
 				w_book += 1
 				gs'stat'
 
-				'You bought the novel for the ladies 300 <b>₽</b>.'
+				'You bought the novel for the ladies 350 <b>₽</b>.'
 
 				act 'Leave':gt'rinok','start'
 			end

+ 92 - 138
locations/salon

@@ -2,15 +2,11 @@
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
-
 	$sexloc = $CURLOC
-
 	if week = 1 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'
 	if week = 3 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'
 	if week = 5 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'
-
 	cla
-	clr
 	*clr
 	salonrand = rand(0, 9)
 	minut += 5
@@ -27,35 +23,30 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">Beauty Bar</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/salon.jpg"></center>'
 	'Approach the <a href="exec:gt ''salon'', ''1''">beauty technician.</a>'
-
 	'See the <a href="exec:gt ''salon'', ''resnici''">eyelash specialist.</a>'
 	if money >= 1000:
 		'<a href="exec:gt ''salon'', ''solyariy''">Solarium - 1,000 <b>₽</b></a>'
 	else
 		'Solarium - 1,000 <b>₽</b>'
 	end
-	if money >= 5000:		
-		'<a href="exec:gt ''salon'', ''ozdormas''">Wellness massage (accelerates fat loss and rejuvenates the body), 5,000 <b>₽</b></a>'
+	if money >= 2500:		
+		'<a href="exec:gt ''salon'', ''ozdormas''">Wellness massage (accelerates fat loss and rejuvenates the body), 2,500 <b>₽</b></a>'
 	else
 		'Lengthening eyelashes - 5,000 <b>₽</b>'
-		'Wellness massage (accelerates fat loss and rejuvenates the body), 5,000 <b>₽</b>'
+		'Wellness massage (accelerates fat loss and rejuvenates the body), 2,500 <b>₽</b>'
 	end
-	if money >= 5000 and lashair = 0:'<a href="exec:gt ''salon'', ''epilyaciya''">Full body depilation - 5,000 <b>₽</b></a>'
-	if money < 5000 or lashair = 1:'Full body depilation - 5,000 <b>₽</b>'
-	if money >= 15000:'<a href="exec:gt ''salon'', ''uhodkosha''">Skin Care - 15,000 <b>₽</b></a>'
-	if money < 15000:'Skin Care - 15,000 <b>₽</b>'
-	if money >= 250000:'<a href="exec:gt ''salon'', ''omoloshenie''">Full body skin rejuvenation - 250,000 <b>₽</b></a>'
-	if money < 250000:'Rejuvenation - 250,000 <b>₽</b>'
-
+	if money >= 2000 and lashair = 0:'<a href="exec:gt ''salon'', ''epilyaciya''">Full body depilation - 2,000 <b>₽</b></a>'
+	if money < 2000 or lashair = 1:'Full body depilation - 2,000 <b>₽</b>'
+	if money >= 5000:'<a href="exec:gt ''salon'', ''uhodkosha''">Skin Care - 5,000 <b>₽</b></a>'
+	if money < 5000:'Skin Care - 5,000 <b>₽</b>'
+	if money >= 25000:'<a href="exec:gt ''salon'', ''omoloshenie''">Full body skin rejuvenation - 25,000 <b>₽</b></a>'
+	if money < 25000:'Rejuvenation - 25,000 <b>₽</b>'
 	if hour < 8 or hour > 20:
 		cls
 		'As the salon closes you are politely asked to leave and come again.'
-
 		act 'Leave':minut += 5 & gt 'torgcentr'
-
 		exit
 	end
-
 	act 'Leave':minut += 5 & gt 'torgcentr'
 end
 
@@ -63,10 +54,8 @@ if $ARGS[0] = 'solyariy':
 	minut += 60
 	pcs_tan += 10
 	money -= 1000
-
 	if salonrand > 6 and npc_QW['A192'] > 2:gt 'etoexhib', 'pos1'
 	if salonrand = 0 and masha = 0:gt 'salon', '0'
-
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/solarium.jpg"></center>'
 	'You take off your clothes and get in the tanning booth.'
@@ -75,13 +64,10 @@ end
 
 if $ARGS[0] = 'resnici':
 	'You are met by a young, dolled-up woman who explains the various lash treatments she can perform:'
-	''
 	'"Well," she says, "I can put on temporary false lashes for you if you''re just going out for the night; you''ll look great, but they won''t last much longer than that."'
 	'She motions over to a small display of stacked boxes, "I can also, if you want a more permanent solution, treat your lashes to help stimulate their growth, but you won''t get the kind of dramatic results you get from falsies."'
 	'"There''s also lash extensions," she explains, "with those we bond either two, four, or six individual lashes to each of your own for what can be a truly dramatic, always-on look. It''s very glam, but they''re expensive and you will have to keep up maintenance on them by coming in regularly."'
 	'"I guess I could also manually remove your eyelash extensions if you ever needed me to," she muses, but seems to hesitate before saying, "but.. I really wouldn''t recommend it. Better to let them grow out naturally."'
-	''
-	''
 	if money >= 5000 and pcs_naturallashes < 2:
 		'<a href="exec:gt ''salon'', ''lashTreatment''">Eyelash growth treatment</a> - 5000<b> ₽</b>'
 		else
@@ -97,35 +83,35 @@ if $ARGS[0] = 'resnici':
 		else
 		'Dramatic false lashes - 1000<b> ₽</b>'
 	end
-	if money >= 12500 and lashextensionduration <= 0:
-		'<a href="exec:lashextensionstyle = 2 & lashextensionnew = 1 & gt ''salon'', ''lashExtension''">2D volume eyelash extensions</a> - 12500<b> ₽</b>'
+	if money >= 2000 and lashextensionduration <= 0:
+		'<a href="exec:lashextensionstyle = 2 & lashextensionnew = 1 & gt ''salon'', ''lashExtension''">2D volume eyelash extensions</a> - 2000<b> ₽</b>'
 		else
-		'2D volume eyelash extensions - 12500<b> ₽</b>'
+		'2D volume eyelash extensions - 2000<b> ₽</b>'
 	end
-	if money >= 20000 and lashextensionduration <= 0:
-		'<a href="exec:lashextensionstyle = 4 & lashextensionnew = 1 & gt ''salon'', ''lashExtension''">4D volume eyelash extensions</a> - 20000<b> ₽</b>'
+	if money >= 5000 and lashextensionduration <= 0:
+		'<a href="exec:lashextensionstyle = 4 & lashextensionnew = 1 & gt ''salon'', ''lashExtension''">4D volume eyelash extensions</a> - 5000<b> ₽</b>'
 		else
-		'4D volume eyelash extensions - 20000<b> ₽</b>'
+		'4D volume eyelash extensions - 5000<b> ₽</b>'
 	end
-		if money >= 45000 and lashextensionduration <= 0:
-		'<a href="exec:lashextensionstyle = 6 & lashextensionnew = 1 & gt ''salon'', ''lashExtension''">6D volume eyelash extensions</a> - 45000<b> ₽</b>'
+		if money >= 10000 and lashextensionduration <= 0:
+		'<a href="exec:lashextensionstyle = 6 & lashextensionnew = 1 & gt ''salon'', ''lashExtension''">6D volume eyelash extensions</a> - 10000<b> ₽</b>'
 		else
-		'6D volume eyelash extensions - 45000<b> ₽</b>'
+		'6D volume eyelash extensions - 10000<b> ₽</b>'
 	end
-	if money >= 6500 and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 2:
-		'<a href="exec:lashextensionnew = 0 & gt ''salon'', ''lashExtension''">Refill your 2D lash extensions</a> - 6500<b> ₽</b>'
+	if money >= 1000 and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 2:
+		'<a href="exec:lashextensionnew = 0 & gt ''salon'', ''lashExtension''">Refill your 2D lash extensions</a> - 1000<b> ₽</b>'
 		else
-		'Refill your 2D lash extensions - 6500<b> ₽</b>'
+		'Refill your 2D lash extensions - 1000<b> ₽</b>'
 	end
-	if money >= 10500 and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 4:
-		'<a href="exec:lashextensionnew = 0 & gt ''salon'', ''lashExtension''">Refill your 4D lash extensions</a> - 10500<b> ₽</b>'
+	if money >= 2500 and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 4:
+		'<a href="exec:lashextensionnew = 0 & gt ''salon'', ''lashExtension''">Refill your 4D lash extensions</a> - 2500<b> ₽</b>'
 		else
-		'Refill your 4D lash extensions - 10500<b> ₽</b>'
+		'Refill your 4D lash extensions - 2500<b> ₽</b>'
 	end
-	if money >= 27500 and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 6:
-		'<a href="exec:lashextensionnew = 0 & gt ''salon'', ''lashExtension''">Refill your 6D lash extensions</a> - 27500<b> ₽</b>'
+	if money >= 5000 and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 6:
+		'<a href="exec:lashextensionnew = 0 & gt ''salon'', ''lashExtension''">Refill your 6D lash extensions</a> - 5,000<b> ₽</b>'
 		else
-		'Refill your 6D lash extensions - 27500<b> ₽</b>'
+		'Refill your 6D lash extensions - 5,000<b> ₽</b>'
 	end
 	if money >= 500 and lashextensionduration > 0:
 		'<a href="exec:lashextensionnew = -1 & gt ''salon'', ''lashExtension''">Remove your eyelash extensions</a> - 500<b> ₽</b>'
@@ -182,19 +168,19 @@ if $ARGS[0] = 'lashExtension':
 		end
 		if lashextensionstyle = 2:
 			if pcs_lashes < 3:pcs_lashes = 3
-			money -= 12500
+			money -= 2000
 			'Over the next hour and a half, you have to lay there quietly, keeping your eyes closed while the technician works at very carefully and precisely bonding a pair of dark, longer lashes to every single one of your natural ones.'
 			minut += 90
 		end
 		if lashextensionstyle = 4:
 			if pcs_lashes < 4:pcs_lashes = 4
-			money -= 20000
+			money -= 5000
 			'Over the two hours and change, you have to lay there quietly, keeping your eyes closed while the technician works at very carefully and precisely bonding two pairs of dark, longer lashes to each and every one of your real ones.'
 			minut += 140
 		end
 		if lashextensionstyle = 6:
 			if pcs_lashes < 5:pcs_lashes = 5
-			money -= 45000
+			money -= 10000
 			'It feels like you''re there forever, listening to customers come and go in the salon''s main room while you lay there still, eyes shut. It takes the technician almost four hours to bond the countless lashes to your own, some even studded with tiny, lightweight jewels. You can feel the weight of them upon your own natural set, hidden somewhere beneath.'
 			minut += 210
 		end
@@ -211,19 +197,19 @@ if $ARGS[0] = 'lashExtension':
 		end
 			if lashextensionstyle = 2:
 			if pcs_lashes < 3:pcs_lashes = 3
-			money -= 6500
+			money -= 1000
 			'Over the next hour or so, you lay there to have your lashes tidied up; the technician re-glues any loose ones and applies new ones to the new growth you''ve had over the past few weeks.'
 			minut += 60
 		end
 		if lashextensionstyle = 4:
 			if pcs_lashes < 4:pcs_lashes = 4
-			money -= 10500
+			money -= 2500
 			'While about an hour and a half passes, the technician makes idle small talk with you while maintaining your bonded extensions, applying new ones to newly-grown lashes and re-affixing any that might''ve come loose.'
 			minut += 90
 		end
 		if lashextensionstyle = 6:
 			if pcs_lashes < 5:pcs_lashes = 5
-			money -= 27500
+			money -= 5000
 			'Even the maintenance on your extravagantly ornate lashes takes forever, the lash technician hunched uncomfortably forward while she applies countless new lashes to each of your newly-sprouted ones, and tidies up any loose ones among the fold.'
 			minut += 120
 		end
@@ -244,7 +230,6 @@ if $ARGS[0] = 'lashExtension':
 		killvar lashextensionduration
 		killvar lashextensionstyle
 	end
-	
 	gs 'body_shape', 'basebeautycalc', 1
 	gs 'stat'
 	'After what seems like forever, you''re finally allowed to open your eyes and take a look.'
@@ -255,10 +240,8 @@ if $ARGS[0] = 'epilyaciya':
 	minut += 60
 	pcs_leghair = -10
 	pcs_pubes = -10
-	money -= 5000
-
+	money -= 2000
 	if salonrand = 0 and masha = 0:gt 'salon', '0'
-
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/depilation.jpg"></center>'
 	'You get a full body hair removal treatment, giving you a smooth and completely hair free body.'
@@ -268,53 +251,44 @@ end
 if $ARGS[0] = 'ozdormas':
 	minut += 60
 	vidageday += 3
-	money -= 5000
+	money -= 2500
 	gs 'stat'
-
 	if salonrand = 0:
 		cla
 		*clr
 		picrand = rand(25, 28)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/mass.jpg"></center>'
 		'During your massage, you moan with pleasure as the guy really knows how to get your muscles to relax, it even makes you a little turned on. You feel his had slide down to your ass and before you can even protest he slips a oiled up finger into your pussy and his thumb in your ass.'
-
 		act 'Indignant':gt 'salon', 'start'
-
 		act 'Enjoy':
 			guy += 1
 			gt 'sex', 'minet'
 		end
 	end
-
-
 	act 'Leave':gt 'salon', 'start'
 end
 
 if $ARGS[0] = 'uhodkosha':
 	minut += 60
 	pcs_skin += 20
-	money -= 15000
+	money -= 5000
 	gs 'body_shape', 'basebeautycalc', 1
 	if salonrand = 0 and masha = 0:gt 'salon', '0'
-
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/facialmask.jpg"></center>'
 	'You get a beauty mask treatment, afterwards your face feels smooth and your skin tight.'
-
 	act 'Leave':gt 'salon', 'start'
 end
 
 if $ARGS[0] = 'omoloshenie':
 	minut += 60
 	vidageday += 50
-	money -= 250000
+	money -= 25000
 	gs 'body_shape', 'basebeautycalc', 1
 	if salonrand = 0 and masha = 0:gt 'salon', '0'
-
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/bodyscrub.jpg"></center>'
 	'You get a full body rejuvenation procedure, afterwards your skin feels soft and silky smooth.'
-
 	act 'Leave':gt 'salon', 'start'
 end
 
@@ -336,90 +310,79 @@ if $ARGS[0] = '0':
 	'The manager quickly comes over to see what the problem is. "What is the problem?"'
 	'You show him the stain on your clothes. "You girl her spilled that stuff on my clothes look at it, it''s ruined."'
 	'He gives the girl a glare for a moment before he gives you a reassuring smile. "Oh no that will come right out with a cleaning, we will do all we can to make this right, we will even pay for the cleaning and I will assure you she will be punished."'
-
 	act 'Agree':money += 5000 & gt 'salon', 'start'
-
-	if pcs_dom > 10:
-		act 'Require punish now':
+	act 'Require punish now':
+		cla
+		orgasm += 1
+		pcs_dom += 1
+		girl += 1
+		'You nod at his offer. "Fine but I want this bitch punished now!'
+		'He seems a bit taken back by your attitude. "Very well, how would you like her punished? Perhaps we can take it out of her pay, or she can do this procedure at no wages." He seems to think these are fitting punishments.'
+		'You shake your head no, no the bitch made your clothes look like they have cum on them. It''s only fitting you return the favor. "No I want you to fuck her right here as I tell you to."'
+		'"I''m sorry, but I can not do that." stammered the guy.'
+		act 'Punish the bitch':
 			cla
-			orgasm += 1
-			pcs_dom += 1
-			girl += 1
-			'You nod at his offer. "Fine but I want this bitch punished now!'
-			'He seems a bit taken back by your attitude. "Very well, how would you like her punished? Perhaps we can take it out of her pay, or she can do this procedure at no wages." He seems to think these are fitting punishments.'
-			'You shake your head no, no the bitch made your clothes look like they have cum on them. It''s only fitting you return the favor. "No I want you to fuck her right here as I tell you to."'
-			'"I''m sorry, but I can not do that." stammered the guy.'
-
-			act 'Punish the bitch':
+			*clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri2.jpg"></center>'
+			'"You asked me how I''d like her to be punished, now fuck her right here as I tell you to." you say, <<$boydesc>> looks from you to her and back to you.'
+			'Clearly he likes your idea of punishment, the bulge now straining against his pants is clear evidence of that. He seems unsure what to say, so you decided to take matters into your own hands.'
+			'You reach over and unzip his pants, reaching inside you grab his now hard <<dick>>cm <<$dick_girth>> dick in your hand and pull it out. As you do you start stroking it, any further protest he might have had vanishes.'
+			gs 'arousal', 'hj', 5, 'dom'
+			gs 'stat'
+			act 'Make the bitch suck it':
 				cla
 				*clr
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri2.jpg"></center>'
-				'"You asked me how I''d like her to be punished, now fuck her right here as I tell you to." you say, <<$boydesc>> looks from you to her and back to you.'
-				'Clearly he likes your idea of punishment, the bulge now straining against his pants is clear evidence of that. He seems unsure what to say, so you decided to take matters into your own hands.'
-				'You reach over and unzip his pants, reaching inside you grab his now hard <<dick>>cm <<$dick_girth>> dick in your hand and pull it out. As you do you start stroking it, any further protest he might have had vanishes.'
-				gs 'arousal', 'hj', 5, 'dom'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri3.jpg"></center>'
+				'When he no longer protest any further, you reach over with your other hand and grab the bitch by her hair. You pull her face over to his cock and you say. "Open your mouth bitch and suck his cock."'
+				'With these words, you push her mouth at his cock, she obediently opens her mouth letting his <<dick>>cm <<$dick_girth>> cock in her mouth, she wraps her lips tightly around it.'
+				'You pull the girls head by her hair back and forth, occasionally forcing her lips against his balls, gagging her as you make her deep throat him.'
+				gs 'arousal', 'voyeur', 5, 'dom'
 				gs 'stat'
-
-				act 'Make the bitch suck it':
+				act 'Doggystyle':
 					cla
 					*clr
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri3.jpg"></center>'
-					'When he no longer protest any further, you reach over with your other hand and grab the bitch by her hair. You pull her face over to his cock and you say. "Open your mouth bitch and suck his cock."'
-					'With these words, you push her mouth at his cock, she obediently opens her mouth letting his <<dick>>cm <<$dick_girth>> cock in her mouth, she wraps her lips tightly around it.'
-					'You pull the girls head by her hair back and forth, occasionally forcing her lips against his balls, gagging her as you make her deep throat him.'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri4.jpg"></center>'
+					'After several minutes of making her gag on his <<dick>>cm <<$dick_girth>> cock, you want a change in the action. You pull her head away and command her. "Take your clothes off bitch."'
+					'She obediently strips naked with out a word, once she is naked you force her to bend over as you look to the man and command him. "Fuck her pussy." He obediently slips his dick in her pussy, both of them let out moans of pleasure.'
+					'He beings to get into it and starts pounding her balls deep. You pull down your panties and spread you legs. Taking one of her hands in yours you put it on your pussy, she diligently begins to massage your clitoris.'
 					gs 'arousal', 'voyeur', 5, 'dom'
+					gs 'arousal', 'vaginal_finger', 5, 'dom'
 					gs 'stat'
-
-					act 'Doggystyle':
+					act 'Put her on top':
 						cla
 						*clr
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri4.jpg"></center>'
-						'After several minutes of making her gag on his <<dick>>cm <<$dick_girth>> cock, you want a change in the action. You pull her head away and command her. "Take your clothes off bitch."'
-						'She obediently strips naked with out a word, once she is naked you force her to bend over as you look to the man and command him. "Fuck her pussy." He obediently slips his dick in her pussy, both of them let out moans of pleasure.'
-						'He beings to get into it and starts pounding her balls deep. You pull down your panties and spread you legs. Taking one of her hands in yours you put it on your pussy, she diligently begins to massage your clitoris.'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri5.jpg"></center>'
+						'A few minutes later you get off the chair and look at him. "Sit in the chair." Which he does at once, then you pull the girl over and point at him.'
+						'"Crawl on top of him and straddle him, ride him." She wastes no time doing as you command, once straddling him she beings to rhythmically ride his cock. As she moans in pleasure you grab her hips and force her all the way down, so he is once again balls deep in her twat.'
 						gs 'arousal', 'voyeur', 5, 'dom'
-						gs 'arousal', 'vaginal_finger', 5, 'dom'
 						gs 'stat'
-
-						act 'Put her on top':
+						act 'Lay them on the floor':
 							cla
 							*clr
-							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri5.jpg"></center>'
-							'A few minutes later you get off the chair and look at him. "Sit in the chair." Which he does at once, then you pull the girl over and point at him.'
-							'"Crawl on top of him and straddle him, ride him." She wastes no time doing as you command, once straddling him she beings to rhythmically ride his cock. As she moans in pleasure you grab her hips and force her all the way down, so he is once again balls deep in her twat.'
-							gs 'arousal', 'voyeur', 5, 'dom'
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri6.jpg"></center>'
+							'Watching this you begin to masturbate, you feel yourself getting turned on as you pussy gets wetter. Unable to be left out anymore, you grab the girl and pull her off, shoving her down on the floor. "Lay on your back."'
+							'She does as you tell her and then you look at the man. "Lay on your side next to her and start fucking her again." His grin tells you he is not only enjoying fucking her but loves that you are telling him how to fuck her.'
+							'He lays down next to her and immediately slips his <<dick>>cm <<$dick_girth>> dick back in her and starts fucking her again. You pull the rest of your clothes off and kneel down over her face. "Lick my pussy, bitch." Which she eagerly does, her tongue laps and teases your clit.'
+							'You can tell she has some experience at eating pussy as it feels great.'
+							gs 'arousal', 'masturbate', 5, 'dom'
+							gs 'arousal', 'cuni', 5, 'dom'
 							gs 'stat'
-
-							act 'Lay them on the floor':
+							act 'Finish':
 								cla
 								*clr
-								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri6.jpg"></center>'
-								'Watching this you begin to masturbate, you feel yourself getting turned on as you pussy gets wetter. Unable to be left out anymore, you grab the girl and pull her off, shoving her down on the floor. "Lay on your back."'
-								'She does as you tell her and then you look at the man. "Lay on your side next to her and start fucking her again." His grin tells you he is not only enjoying fucking her but loves that you are telling him how to fuck her.'
-								'He lays down next to her and immediately slips his <<dick>>cm <<$dick_girth>> dick back in her and starts fucking her again. You pull the rest of your clothes off and kneel down over her face. "Lick my pussy, bitch." Which she eagerly does, her tongue laps and teases your clit.'
-								'You can tell she has some experience at eating pussy as it feels great.'
-								gs 'arousal', 'masturbate', 5, 'dom'
+								telmasha = 1
+								masha += 1
+								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri7.jpg"></center>'
+								$orgasm_txt = 'You begin to pant and moan and finally you have a intense orgasm, coating the girls face in your pussy juices. Seeing this the guy grunts and starts pounding harder, obviously getting near to blowing his load as well.'
+								$orgasm_or = 'custom'
 								gs 'arousal', 'cuni', 5, 'dom'
+								gs 'arousal', 'end'
 								gs 'stat'
-
-								act 'Finish':
-									cla
-									*clr
-									telmasha = 1
-									masha += 1
-									'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri7.jpg"></center>'
-									$orgasm_txt = 'You begin to pant and moan and finally you have a intense orgasm, coating the girls face in your pussy juices. Seeing this the guy grunts and starts pounding harder, obviously getting near to blowing his load as well.'
-									$orgasm_or = 'custom'
-									gs 'arousal', 'cuni', 5, 'dom'
-									gs 'arousal', 'end'
-									gs 'stat'
-									'Standing up you look at him. "Don''t cum in her, stand up." With a slight frown from being so close he does as you tell him. You grab the girl by the hair and pull her up till she is kneeling in front of the guy.'
-									'"Stroke his cock till he cums all over your face." The guy is grinning again as she grabs his cock and begins jerking him off for all she''s worth, while you get dressed. It doesn''t take long before he is shooting his cum all over her pretty face.'
-									'You look at the man. "That''s how you punish bitches." Glancing at her you add. "Isn''t that right bitch?" She nods in agreement, though you are not sure if it is because she really does agree or she is just doing what you say.'
-									'Either way you find it a turn on, with that you take the offered money and grab one of her cards off the counter reading it. "Masha huh? You really know how to use your tongue, I might just call you, so you can use it again." You say to her and then without another glance at the two of them or waiting for a reply you walk out, leaving Masha kneeling on the floor covered in sperm.'
-
-									act 'Leave':money += 5000 & gt 'salon', 'start'
-								end
+								'Standing up you look at him. "Don''t cum in her, stand up." With a slight frown from being so close he does as you tell him. You grab the girl by the hair and pull her up till she is kneeling in front of the guy.'
+								'"Stroke his cock till he cums all over your face." The guy is grinning again as she grabs his cock and begins jerking him off for all she''s worth, while you get dressed. It doesn''t take long before he is shooting his cum all over her pretty face.'
+								'You look at the man. "That''s how you punish bitches." Glancing at her you add. "Isn''t that right bitch?" She nods in agreement, though you are not sure if it is because she really does agree or she is just doing what you say.'
+								'Either way you find it a turn on, with that you take the offered money and grab one of her cards off the counter reading it. "Masha huh? You really know how to use your tongue, I might just call you, so you can use it again." You say to her and then without another glance at the two of them or waiting for a reply you walk out, leaving Masha kneeling on the floor covered in sperm.'
+								act 'Leave':money += 5000 & gt 'salon', 'start'
 							end
 						end
 					end
@@ -432,29 +395,23 @@ end
 if $ARGS[0] = '1':
 	cla
 	minut += 5
-
 	if worksalon = 0:
 		'You ask the manager if he has a job opening.'
-
 		if masash < 10:
 			'After asking the manager about a job he tells you. "You need to complete a massage course at the community center before I can hire you."'
-
 			act 'Move away':gt 'salon', 'start'
 		elseif masash >= 10:
-			'The manager tells you. "We need a masseuse. You''d work Monday, Wednesday and Friday be here between 9:00 and 10:00, your shift will finish at 19:00. Your wages will be 800<b> ₽</b> per shift."'
+			'The manager tells you. "We need a masseuse. You''d work Monday, Wednesday and Friday, work starts at 10:00, your shift will finish at 19:00. Your wages will be 1560<b> ₽</b> per shift."'
             '"You''ll need to file your paperwork with the personnel department."'
-
 			if (work = 0 and worksalon = 0) or (cheatWork = 1 and worksalon = 0):
 				act 'Take the job':
 					cla
 					worksalon = 1
 					work = 1
 					'You file your paperwork with the personnel department'
-
 					act 'Move away':gt 'salon', 'start'
 				end
 			end
-
 			act 'Move away':gt 'salon', 'start'
 		end
 	elseif worksalon = 1:
@@ -469,12 +426,10 @@ if $ARGS[0] = 'beginwork':
 	'<center><b><font color="maroon">Beauty</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/salon.jpg"></center>'
 	'You go to your workstation and prepare it as you wait for your first customer.'
-
 	act 'Start work':
 		smena += 1
 		gt 'worksalon', 'start'
 	end
-
 	act 'Resign':gt 'salon', 'discharge'
 end
 
@@ -483,11 +438,10 @@ if $ARGS[0] = 'discharge':
 	minut += 10
 	worksalon = 0
 	work = 0
-	pay = smena * 800
+	pay = smena * 1560
 	money += pay
 	smena = 0
 	'You tell your boss you have had enough and that you quit. He looks at you a moment and then says. "Here is your paycheck <<pay>> <b>₽</b> and employment history. Goodbye."'
-
 	act 'Leave':gt 'salon', 'start'
 end
 

+ 32 - 30
locations/shop

@@ -235,14 +235,16 @@ if $shoplocation = 'grocery':
 		''
 	end	
 	*pl '<center><table align="center" width=80%>' 
-	*P FUNC ('$stock_item', 1, 'Regular food', 50, 'eda', $CURLOC) 
-	*P FUNC ('$stock_item', 10, 'Regular food', 500, 'eda', $CURLOC) 
-	*P FUNC ('$stock_item', 1, 'Diet food', 250, 'edaD', $CURLOC) 
-	*P FUNC ('$stock_item', 10, 'Diet food', 2500, 'edaD', $CURLOC) 
-	*P FUNC ('$stock_item', 10, 'Tea biscuits', 300, 'pranik', $CURLOC)
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of water', 50, 'bottle', $CURLOC), '<tr><td></td><td>Bottle of water</td><td colspan=2>You need a handbag</td><td>for 50 <b>₽</b></td></tr>') 
+	*P FUNC ('$stock_item', 1, 'Regular food', 80, 'eda', $CURLOC) 
+	*P FUNC ('$stock_item', 10, 'Regular food', 800, 'eda', $CURLOC) 
+	*P FUNC ('$stock_item', 1, 'Diet food', 300, 'edaD', $CURLOC) 
+	*P FUNC ('$stock_item', 10, 'Diet food', 3000, 'edaD', $CURLOC) 
+	*P FUNC ('$stock_item', 10, 'Tea biscuits', 400, 'pranik', $CURLOC)
+	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $CURLOC), '<tr><td></td><td>Bottle of water</td><td colspan=2>You need a handbag</td><td>for 50 <b>₽</b></td></tr>') 
 	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC), '<tr><td></td><td>Sandwich</td><td colspan=2>You need a handbag</td><td>for 100 <b>₽</b></td></tr>') 
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of wine', 500, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>') 
+	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>') 
+	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Average Bottle of wine', 500, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>') 
+	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Quality Bottle of wine', 1000, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>') 
 	*P '</table></center>'
 	gs 'stat'
 	if night_mode = 1:
@@ -282,19 +284,19 @@ if $shoplocation= 'cosmetics':
 		''
 	end	
 	*pl '<center><table align="center" width=80%>' 
-	*P FUNC ('$stock_item', 50, 'Cosmetics', 1000, 'kosmetica', $CURLOC) 
+	*P FUNC ('$stock_item', 50, 'Cosmetics', 1300, 'kosmetica', $CURLOC) 
 	*P FUNC ('$stock_item', 10, 'Plain false lashes', 1500, 'falselashesplain',$CURLOC)
 	*P FUNC ('$stock_item', 3, 'Mink false lashes', 900, 'falselashesmink',$CURLOC)
-	*P FUNC ('$stock_item', 10, 'Razors', 500, 'stanok', $CURLOC) 
+	*P FUNC ('$stock_item', 10, 'Razors', 1000, 'stanok', $CURLOC) 
 	*P FUNC ('$stock_item', 20, 'Sunblock', 500, 'krem', $CURLOC) 
 	*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', $CURLOC) 
-	*P FUNC ('$stock_item', 20, 'Sanitary napkins', 200, 'sanpad', $CURLOC) 
-	*P FUNC ('$stock_item', 30, 'Shampoo', 500, 'shampoo', $CURLOC) 
+	*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', $CURLOC) 
+	*P FUNC ('$stock_item', 30, 'Shampoo', 250, 'shampoo', $CURLOC) 
 	*P FUNC ('$stock_item', 10, 'Hair scrunchies', 80, 'hscrunch', $CURLOC) 
 	*P FUNC ('$stock_item', 12, 'Hair pins', 100, 'hpingrip', $CURLOC)
-	*P FUNC ('$stock_item', 10, 'Wipes', 100, 'salfetka', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*P FUNC ('$stock_item', 10, 'Portable makeup', 1000, 'kosmetitka', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*P FUNC ('$stock_item', 20, 'Mouthwash', 400, 'mouthwash', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*P FUNC ('$stock_item', 10, 'Wipes', 50, 'salfetka', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*P FUNC ('$stock_item', 10, 'Portable makeup', 700, 'kosmetitka', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*P FUNC ('$stock_item', 20, 'Mouthwash', 150, 'mouthwash', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
 	*P FUNC ('$single_stock_item', 1, 'Comb', 150, 'greben', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
 	*P '</table></center>'
 	gs 'stat'
@@ -338,9 +340,9 @@ if $shoplocation = 'hardware':
 		''
 	end	
 	*pl '<center><table align="center" width=80%>' 
-	*P FUNC ('$stock_item', 20, 'Dishwashing detergent', 100, 'fairy', $CURLOC) 
-	*P FUNC ('$stock_item', 30, 'Clothing detergent', 250, 'poroshok', $CURLOC) 
-	*P FUNC ('$stock_item', 5, 'Plates', 300, 'cltarelka', $CURLOC) 
+	*P FUNC ('$stock_item', 20, 'Dishwashing detergent', 500, 'fairy', $CURLOC) 
+	*P FUNC ('$stock_item', 30, 'Clothing detergent', 500, 'poroshok', $CURLOC) 
+	*P FUNC ('$stock_item', 5, 'Plates', 450, 'cltarelka', $CURLOC) 
 	*P '</table></center>'
 	*nl
 	
@@ -429,12 +431,12 @@ if $shoplocation = 'clothing':
 		act 'View underwear': $shoplocation = 'underwear' & gt 'shop'
 
 		if konki!1:
-			'A pair of ice-skates are available for 500 <b>₽</b>.'
-			if money >= 500:
-				act 'Buy skates for 500 <b>₽</b>':
+			'A pair of ice-skates are available for 3000 <b>₽</b>.'
+			if money >= 3000:
+				act 'Buy skates for 3000 <b>₽</b>':
 					cla
 					*clr
-					money = money - 500
+					money = money - 3000
 					konki = 1
 
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/konki_shop.jpg"></center>'
@@ -574,15 +576,15 @@ if $shoplocation = 'tech':
 		''
 	end	
 	*pl '<center><table align="center" width=80%>' 
-	*P FUNC ('$single_stock_item', 1, 'Scondhand Small CRT TV', 5000, 'TV', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
-	*P FUNC ('$single_stock_item', 2, 'Large Plasma TV', 35000, 'TV', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
-	*P FUNC ('$single_stock_item', 1, 'Computer', 25000, 'komp', $CURLOC)
-	*p FUNC ('$single_stock_item', 1, 'Computer game Dead Sunset', 500, 'GameCD2', $CURLOC, '', iif(komp > 0, 0, 1), 'You need a computer')
-	*P FUNC ('$single_stock_item', 1, 'Dishwasher', 50000, 'posudomashina', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
-	*P FUNC ('$single_stock_item', 1, 'Washing machine', 50000, 'stiralka', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
-	*P FUNC ('$single_stock_item', 1, 'Camera', 10000, 'zenit', $CURLOC) 
-	*P FUNC ('$single_stock_item', 1, 'Mini camera disguised as a cigarette pack', 40000, 'minifoto', $CURLOC)
-	*P FUNC ('$single_stock_item', 1, 'Webcam', 10000, 'webcamera', $CURLOC, '', iif((npc_rel['A11']>=30 and webcamera = 0) or (camwhore = 1 and webcamera = 0), 0, 1), 'You have no use this')
+	*P FUNC ('$single_stock_item', 1, 'Small TV', 15000, 'TV', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
+	*P FUNC ('$single_stock_item', 2, 'Large Plasma TV', 30000, 'TV', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
+	*P FUNC ('$single_stock_item', 1, 'Computer', 40000, 'komp', $CURLOC)
+	*p FUNC ('$single_stock_item', 1, 'Computer game Dead Sunset', 800, 'GameCD2', $CURLOC, '', iif(komp > 0, 0, 1), 'You need a computer')
+	*P FUNC ('$single_stock_item', 1, 'Dishwasher', 28000, 'posudomashina', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
+	*P FUNC ('$single_stock_item', 1, 'Washing machine', 30000, 'stiralka', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
+	*P FUNC ('$single_stock_item', 1, 'Camera', 20000, 'zenit', $CURLOC) 
+	*P FUNC ('$single_stock_item', 1, 'Mini camera disguised as a cigarette pack', 100000, 'minifoto', $CURLOC)
+	*P FUNC ('$single_stock_item', 1, 'Webcam', 2000, 'webcamera', $CURLOC, '', iif((npc_rel['A11']>=30 and webcamera = 0) or (camwhore = 1 and webcamera = 0), 0, 1), 'You have no use this')
 	*P '</table></center>'
 	gs 'stat'
 	if night_mode = 1:

+ 1 - 1
locations/vokzalGin

@@ -107,7 +107,7 @@ if $ARGS[0] = '':
 				cls
 				cleZarplatDay = daystart
 				vokzalVork += 1
-				money += 250
+				money += 130
 				minut += 3
 				gs 'stat'
 				'When you are done cleaning all the places you were told to clean, you go to the cashier and collect your well-earned salary.'