Merge remote-tracking branch 'julzor/master'

locations/_stock_item_info.qsrc

@@ -39,6 +39,7 @@ $item_info['compmag'] = '<center><b>Computer magazine</b></center><br>While most
 $item_info['biomag'] = '<center><b>Biographical magazine</b></center><br>An educational magazine that explores the lives and minds of various leaders, artists, educators, innovators, and entrepreneurs from all over the world.'
 $item_info['cookmag'] = '<center><b>Cooking magazine</b></center><br>Whether your food is always turning out burnt or you know your way around a kitchen, this magazine is perfect for everyone! Inside are tons of tips and tricks along with various recipes ranging from quick 5 Minute dishes to baking some yummy desserts!'
 $item_info['knitmag'] = '<center><b>Knitting magazine</b></center><br>For those that are creative, this magazine offers in-depth guides ranging from super simple to challenging, with varying styles of traditional to cutting edge modern designs.'
+$item_info['compact_mirror'] = '<center><b>Compact Mirror</b></center><br>A small compact that can be carried in your purse. It has a small mirror that can be used to apply a light layer of makeup on a bare face, or fix any smeared makeup. It also has a tiny comb on the bottom half that can be unfolded and used to style your hair.'
 if $item_info[$ARGS[0]]!'':
 	$RESULT = '<a href="exec: MSG ''<<$item_info[$ARGS[0]]>>''"><img src="images/system/icon/anptekainfo.jpg"></a>'
 else

locations/anushapt.qsrc

@@ -430,7 +430,7 @@ if $ARGS[0] = 'computer':
 	end
 end
 
-if $ARGS[0] 'agreeporn':
+if $ARGS[0] = 'agreeporn':
 	*clr
 	cla
 	'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'

locations/din_bad.qsrc

@@ -1,7 +1,6 @@
 # din_bad
 
 $mobile_check = {
-
 	gs 'stat'
 	if vladimirday ! daystart and hour >= 15 and hour <= 17:
 		if vladimirQW = 20:
@@ -95,22 +94,7 @@ $d_salf = {
 	'<a href="exec:gs ''stat'' & gs ''din_bad'', ''d_bag''"><br><b>Put tissues away</b></a>'
 	'</td></tr></table></center>'
 }
-
-$d_kosmetitka = {
-	*clr & cla
-	'<center><h1>Cosmetics</h1></center>'
-	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td cellspacing="0" cellpadding="0" valign="top">'
-	gs 'stat'
-
-	if kosmetitka >= 1: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Light make-up</b></a>'
-	if kosmetitka >= 2: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 3 & kosmetitka -= 2 & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Natural make-up</b></a>'
-	if kosmetitka >= 3: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 4 & kosmetitka -= 3 & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Heavy make-up</b></a>'
-	act 'Close makeup bag':gs 'stat' & gs 'din_bad', 'd_bag'
-	'</td></tr></table></center>'
-}
-
+		
 $d_mouthwash = {
 	*clr & cla
 	'<center><h1>Mouth Wash</h1></center>'
@@ -130,18 +114,29 @@ $d_mouthwash = {
 
 if $ARGS[0] = 'd_bag':
 	*clr & cla
+	gs 'stat'
 	'<center><h1>Purse</h1></center>'
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	if salfetka > 0: 'You have <b><<salfetka>></b> wet wipes left in your purse. <a href="exec:dynamic $d_salf">Use a tissue</a>'
 	if pain_timer > totminut - 242 and painkiller > 0: 'Take a <a href="exec:pain[''killer''] = 1 & painkiller -= 1 & pain_timer = totminut & gs ''din_bad'', ''d_bag''">painkiller</a>. <b><<painkiller>></b> painkillers left in your purse.'
-	if kosmetitka > 0 and pcs_makeup = 1: 'There''s portable makeup in your purse. <b><<kosmetitka>></b> cosmetic applications left. <a href="exec:dynamic $d_kosmetitka">Put on makeup</a>'
-	if kosmetitka > 0 and pcs_makeup ! 1: 'There''s portable makeup in your purse. <b><<kosmetitka>></b> cosmetic applications left.'
-	if mouthwash > 0 and (pcs_breath = 0 or cumloc[12] = 1): 'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining. <a href="exec:dynamic $d_mouthwash">Use mouthwash</a>'
-	if mouthwash > 0 and pcs_breath = 1 and cumloc[12] = 0: 'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining.'
-	if greben > 0 and pcs_hairbsh = 0: 'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	if greben > 0 and pcs_hairbsh = 1: 'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
+	if mouthwash > 0 and (pcs_breath = 0 or cumloc[12] = 1): 
+		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining. <a href="exec:dynamic $d_mouthwash">Use mouthwash</a>'
+	elseif mouthwash > 0 and pcs_breath = 1 and cumloc[12] = 0:
+		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining.'
+	end
+	if (compact_mirror = 1 or greben = 1) and pcs_hairbsh = 0: 
+		'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
+	elseif (compact_mirror = 1 or greben = 1) and pcs_hairbsh = 1: 
+		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
+	end
+
+	if compact_mirror = 1: 
+		'You have a <a href="exec: gt ''mirror'', ''d_bag_mirror''">compact mirror</a> in your purse'+iif(kosmetitka > 0, ' and some portable makeup.', '.')
+	elseif compact_mirror = 0 and kosmetitka > 0:
+		'You have some portable makeup in your purse, but you need a compact mirror to apply it.'
+	end		
 	if prezik + prezikcount + preziksabo > 0:
 		if preziktype = 2 or preziksabo > 0:
 			'You have <b><<iif(preziktype = 2, prezikcount, prezikcount+prezik)>></b> normal condoms left, and <b><<iif(preziktype = 2, prezik+preziksabo, preziksabo)>></b> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu">condoms left in your purse.</a>'
@@ -173,15 +168,8 @@ if $ARGS[0] = 'd_bag':
 	if wine = 1 and alkowine = 0:'There''s a bottle of <a href="exec:dynamic $dinalkowin1">wine</a> in your purse.'
 	if wine = 1 and alkowine = 1:'There''s a half-bottle of <a href="exec:dynamic $dinalkowin2">wine</a> in your purse.'
 	if foto = 1:'Your purse contains a strange photo'
-	if pattest > 0:
-		iif(used_pattest > 1,$tt = 's',$tt = '')
-		'You have <b><<pattest>></b> unused paternity test<<$tt>> in your purse.'
-	end
-	if used_pattest > 0:
-		iif(used_pattest > 1,$tt = 's',$tt = '')
-		'You have <b><<used_pattest>></b> <a href="exec:dynamic $test_purse">used</a> paternity test<<$tt>> in your purse.'
-	end
-	killvar 'tt'
+	if pattest > 0: 'You have <b><<pattest>></b> unused paternity test'+iif(used_pattest > 1, 's ', ' ')+'in your purse.'
+	if used_pattest > 0: 'You have <b><<used_pattest>></b> <a href="exec:dynamic $test_purse">used</a> paternity test'+iif(used_pattest > 1, 's ', ' ')+'in your purse.'
 
 	act 'Return':gt 'obj_din', 'menu_exit'
 	'</td></tr></table></center>'

locations/mirror.qsrc

@@ -17,8 +17,6 @@ if $ARGS[0] = 'start':
 	if mirror_steam ! hour: mirror_steam = 100
 	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour: gt'mirror','steam'
 
-	if pcs_hairbsh = 0: act 'Brush your hair': xgt 'mirror', 'brush'
-
 	*nl
 	if daystart < 10 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
 	if daystart >= 10 and daystart < 30 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
@@ -35,7 +33,6 @@ if $ARGS[0] = 'start':
 		if dyefade = 0: '<br>Your hair dye has faded and looks terrible.'
 	end
 
-
 	if kosmetica > 0: *nl 'Cosmetics: <<kosmetica>>' else *nl 'You have no makeup.'
 	if lipbalm > 0: *pl ' | Lip gloss: <<lipbalm>>' else *pl ' You have no lip gloss left.'
 	if falselashesplain > 0: *nl 'False lashes: <<falselashesplain>>' else *nl 'You have no false lashes left.'
@@ -86,6 +83,8 @@ if $ARGS[0] = 'start':
 
 	act 'Move away from the mirror':gt 'mirror','fin'
 	
+	if pcs_hairbsh = 0: act 'Brush your hair': xgt 'mirror', 'brush'
+	
 	! WD: Cheat Unused ~ 'AutoLipBalm'
 
 	!! Added the makeup setting.
@@ -449,7 +448,6 @@ if $routine4 ! '' and pcs_makeup < 2:
 	end
 end
 
-
 if $ARGS[0] = 'works':
 	cla
 	if kosmetica <= 0:
@@ -543,6 +541,73 @@ if $ARGS[0] = 'fin':
 	gt $locM, $metkaM
 end &! --- fin ----
 
+if $ARGS[0] = 'd_bag_mirror':
+	*clr & cla
+	gs 'stat'
+	'<center><h1>Compact Mirror</h1></center>'
+	'<center><img <<$set_imgh>> src="/images/shared/Accessories/compact_mirror.jpg"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
+	'You have '+iif(kosmetitka > 0, '<b><<kosmetitka>></b>', 'no')+' cosmetic applications and '+iif(salfetka > 0, '<b><<salfetka>></b>', 'no')+' tissues left in your purse.'
+	*nl
+	if pcs_hairbsh = 0: '<a href="exec: pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
+	if salfetka > 0 and pcs_makeup ! 1: '<center><a href="exec: salfetka -= 1 & pcs_makeup = 1 & gt ''mirror'', ''d_bag_mirror''"><b>Remove your makeup</b></a>'
+	if kosmetitka > 0 and pcs_makeup = 1:
+		'<a href="exec: minut += 3 & makupskl_exp += rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gt ''mirror'', ''d_bag_mirror''"><b>Put on light makeup</b></a>'
+		!!Remove this coment and uncomment the next line to restore the ability to put on any typ of makeup
+		!!'<center><a href="exec: gt ''mirror'', ''kosmetitka_apply'' "><b>Put on makeup</b></a></center>'
+	elseif salfetka > 0 and pcs_makeup = 0 and ((makeupSetting = 1 and kosmetitka >= 1) or (makeupSetting = 2 and kosmetitka >= 2) or (makeupSetting = 3 and kosmetitka >= 3)):
+		'a href="exec: gt ''mirror'', ''kosmetitka_fix'' "><b>Fix your makeup</b></a>'
+	elseif (kosmetitka = 0 or salfetka = 0) and pcs_makeup = 0:
+		'You need portable makeup and tissues to fix your makeup.'
+	end
+	'</td></tr></table></center>'	
+	act 'Finish': gt 'din_bad', 'd_bag'
+end
+
+if $ARGS[0] = 'kosmetitka_apply':
+	*clr & cla
+	'<center><h1>Compact Mirror</h1></center>'
+	'<center><img <<$set_imgh>> src="/images/shared/Accessories/compact_mirror.jpg"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
+	gs 'stat'
+
+	if kosmetitka >= 1: '<a href="exec: minut += 3 & makupskl_exp += rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gt ''mirror'', ''d_bag_mirror''"><b>Light make-up</b></a>'
+	if kosmetitka >= 2: '<a href="exec: minut += 5 & makupskl_exp += rand(1,3) & pcs_makeup = 3 & kosmetitka -= 2 & gt ''mirror'', ''d_bag_mirror''"><b>Natural make-up</b></a>'
+	if kosmetitka >= 3: '<a href="exec: minut += 10 & makupskl_exp += rand(1,3) & pcs_makeup = 4 & kosmetitka -= 3 & gt ''mirror'', ''d_bag_mirror''"><b>Heavy make-up</b></a>'
+	'</td></tr></table></center>'
+	act 'Finish': gt 'mirror', 'd_bag_mirror'
+end
+
+if $ARGS[0] = 'kosmetitka_fix':
+	*clr & cla
+	'<center><h1>Compact Mirror</h1></center>'	
+	'<center><img <<$set_imgh>> src="/images/shared/Accessories/compact_mirror.jpg"></center>'
+	salfetka -= 1
+	makupskl_exp += rand(1,3)
+	if makeupSetting = 1:
+		minut += 3		
+		kosmetitka -= 1
+		pcs_makeup = 2
+		'<center>You carefully fix your makeup and restore the neutral and light tones that bring out your natural beauty.</center>'
+	elseif makeupSetting = 2:
+		minut += 5
+		kosmetitka -= 2
+		pcs_makeup = 3
+		'<center>You carefully fix your makeup and restore the mildly vibrant tones and colors that cover your minor imperfections and enhance your best features.</center>'			
+	elseif makeupSetting = 3:
+		minut += 10
+		kosmetitka -= 3
+		vidageday -= 1
+		pcs_makeup = 4
+		'<center>You carefully fix your makeup and restore the deeper, richer shades, thick enough to cover most imperfections, while drawing attention to your eyes and lips.</center>'
+	end
+
+	gs 'stat'
+	
+	act 'Continue': gt 'mirror', 'd_bag_mirror'
+end
 
 --- mirror ---------------------------------
 

locations/pavaptcourtev.qsrc

@@ -225,13 +225,14 @@ if $ARGS[0] = 'events1':
 		gs 'stat'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 15:
+		if storyline ! 1: jump 'storyline_jump1'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evgopbj.jpg"></center>'
-		if storyline ! 1 or (soniaPS > 0 and rand(0,1) = 0):
+		if soniaPS > 0 and rand(0,1) = 0:
 			'Between two of the storage buildings you notice Sonia squatting between Vitek, Dan and Vasily, taking turns sucking their cocks. She seems quite into the blow-jobs, almost as much as the three guys. It doesn''t take too long before the three Gopniks start jerking their dicks and cumming all over Sonia''s face.'
 			*nl
 			'The trio begin laughing as they put their dicks back in the pants. Dan pulls out his phone and starts taking photos of Sonia still covered in their cum. As she gets to her feet, both Vitek and Vasily grab her by the arms and start pulling her towards the street, never giving her a chance to clean the cum from her face. She tries to struggle but they don''t seem to care and soon they''re gone.'
-		else:
+		else
 			'Between two of the storage buildings you notice a girl squatting between Vitek, Dan and Vasily, taking turns sucking their cocks. Although you don''t recognize the girl, you''ve spotted her around before. She seems quite into the blow-jobs, almost as much as the three guys. It doesn''t take too long before the three Gopniks start jerking their dicks and cumming all over the girl''s face.'
 			*nl
 			'The trio begin laughing as they put their dicks back in the pants. Dan pulls out his phone and starts taking photos of the girl still covered in their cum. As she gets to her feet, both Vitek and Vasily grab her by the arms and start pulling her towards the street, never giving her a chance to clean the cum from her face. She tries to resist but they don''t seem to care and soon they''re gone.'
@@ -337,8 +338,9 @@ if $ARGS[0] = 'events2':
 		gs 'stat'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif nightevents = 5:
+		if storyline ! 1: jump 'storyline_jump2'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evgopbjn.jpg"></center>'
-		if storyline ! 1 or (soniaPS > 0 and rand(0,1) = 0):
+		if soniaPS > 0 and rand(0,1) = 0:
 			'Between two of the storage buildings you notice Sonia squatting between Vitek, Dan and Vasily, taking turns sucking their cocks. She seems quite into the blow-jobs, almost as much as the three guys. It doesn''t take too long before the three Gopniks start jerking their dicks and cumming all over Sonia''s face.'
 			*nl
 			'The trio begin laughing as they put their dicks back in the pants. Dan pulls out his phone and starts taking photos of Sonia still covered in their cum. As she gets to her feet, both Vitek and Vasily grab her by the arms and start pulling her towards the street, never giving her a chance to clean the cum from her face. She tries to struggle but they don''t seem to care and soon they''re gone.'

locations/shop.qsrc

@@ -222,15 +222,15 @@ if $shoplocation = 'grocery':
 		''
 	end
 	*pl '<center><table align="center" width=80%>'
-	*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 FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*P FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*P FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
-	*P '</table></center>'
+	*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 func ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p '</table></center>'
 	gs 'stat'
 	gs 'themes', 'indoors'
 
@@ -258,21 +258,22 @@ if $shoplocation= 'cosmetics':
 		''
 	end
 	*pl '<center><table align="center" width=80%>'
-	*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', 40, 'Razors', 700, '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', 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', 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>'
+	*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', 40, 'Razors', 700, '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', 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', 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 func ('$single_stock_item', 1, 'Compact Mirror', 1150, 'compact_mirror', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p '</table></center>'
 	gs 'stat'
 	gs 'themes', 'indoors'
 
@@ -300,13 +301,13 @@ if $shoplocation = 'hardware':
 		''
 	end
 	*pl '<center><table align="center" width=80%>'
-	*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 FUNC ('$stock_item', 5, 'Fabric', 250, 'tkan', $CURLOC)
-	*P FUNC ('$single_stock_item', 1, 'Sewing kit', 500, 'sewing_kit', $CURLOC)
-	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a purse')
-	*P '</table></center>'
+	*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 func ('$stock_item', 5, 'Fabric', 250, 'tkan', $curloc)
+	*p func ('$single_stock_item', 1, 'Sewing kit', 500, 'sewing_kit', $curloc)
+	*p func ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', $curloc, '', iif(bag > 0, 0, 1), 'You need a purse')
+	*p '</table></center>'
 	*nl
 
 	gs 'stat'
@@ -351,7 +352,7 @@ if $shoplocation = 'clothing':
 				'<center><img <<$set_imgh>> src="images/pc/clothing/12swimwear/4.jpg"></center>'
 				gs 'clothing_attributes', 'swimwear', 4
 				'Swimwear 4'
-				FUNC('$clothing_name', 'swimwear', 4)
+				func('$clothing_name', 'swimwear', 4)
 				if CloInhibit > pcs_inhib:'You don''t feel daring enough to buy an outfit this revealing.'
 				'Costs 1,000 <b>₽</b>.'
 
@@ -375,7 +376,7 @@ if $shoplocation = 'clothing':
 				'<center><img <<$set_imgh>> src="images/pc/clothing/11coat/1.jpg"></center>'
 				gs 'clothing_attributes', 'coat', 1
 				'Coat 1'
-				FUNC('$clothing_name', 'coat', 1)
+				func('$clothing_name', 'coat', 1)
 				if CloInhibit > pcs_inhib:'You don''t feel daring enough to buy an outfit this revealing.'
 				'Costs 5,000 <b>₽</b>.'
 
@@ -481,16 +482,16 @@ if $shoplocation = 'tech':
 		''
 	end
 	*pl '<center><table align="center" width=80%>'
-	*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 for this')
-	*P '</table></center>'
+	*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 for this')
+	*p '</table></center>'
 	gs 'stat'
 	gs 'themes', 'indoors'