[fixed] Some more old variables

locations/din_bad.qsrc

@@ -157,11 +157,11 @@ if $ARGS[0] = 'd_bag':
 		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
 	end
 	if pcs_hairlng > 80 and mc_inventory['scrunchies'] >= 1 and hbraids = 0:
-		if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''din_bad'', ''d_bag''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
+		if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''din_bad'', ''d_bag''">ponytail</a>. You have <<mc_inventory[''scrunchies'']>> scrunchies left.'
 		if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''din_bad'', ''d_bag''">scrunchie</a> to get rid of the ponytail.'
 	end
 	if pcs_hairlng > 80 and pcs_hairlng <= 400 and mc_inventory['kirbygrips'] >= 1 and hbraids = 0:
-		if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''din_bad'', ''d_bag''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
+		if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''din_bad'', ''d_bag''">updo your hair</a>. You have <<mc_inventory[''kirbygrips'']>> hair accessories at your disposal.'
 		if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''din_bad'', ''d_bag''">flow free</a>.'
 	end
 	if pcs_hairlng > 80 and pcs_hairlng <= 800 and mc_inventory['scrunchies'] >= 2 and hbraids = 0:

locations/gadmarket.qsrc

@@ -29,7 +29,7 @@ $gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 145, 'cookma
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Knitting magazine', 145, 'knitmag', 'gadmarket')
 if preziktype = 0: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezik', 'gadmarket')
 if preziktype = 1 or preziktype = 2: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezikcount', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'tampon', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'mc_inventory[''tampons'']', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 25, 'Razors (number of shaves)', 350, 'stanok', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 30, 'Shampoo', 250, 'shampoo', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')

locations/gas_station_gp_117.qsrc

@@ -87,8 +87,8 @@ if $ARGS[0] = 'shop' or $gas_shop_inside = 'yes':
 	$prostitute_shop_tab += func ('$single_stock_item', 1, 'Cooking magazine', 430, 'cookmag', $curloc)
 	$prostitute_shop_tab += func ('$single_stock_item', 1, 'Knitting magazine', 430, 'knitmag', $curloc)
 	$prostitute_shop_tab += func ('$single_stock_item', 1, 'Fitness magazine', 430, 'fitmag', $curloc)
-	$prostitute_shop_tab += func ('$stock_item', 10, 'Wipes', 50, 'salfetka', $curloc, '', iif(bag > 0, 0, 1), 'You need a purse')
-	$prostitute_shop_tab += func ('$stock_item', 20, 'Tampons', 200, 'tampon', $curloc)
+	$prostitute_shop_tab += func ('$stock_item', 10, 'Wipes', 50, 'mc_inventory[''makeup_wipes'']', $curloc, '', iif(bag > 0, 0, 1), 'You need a purse')
+	$prostitute_shop_tab += func ('$stock_item', 20, 'Tampons', 200, 'mc_inventory[''tampons'']', $curloc)
 	if umbrella = 0: $prostitute_shop_tab += func ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', $curloc, '', iif(bag > 0, 0, 1), 'You need a purse')
 	$prostitute_shop_tab += '</table></center>'
 	*pl $prostitute_shop_tab

locations/intro_customization.qsrc

@@ -180,10 +180,10 @@ if $ARGS[0] = 'modite_cos':
 	*nl
 	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''cosmetics''] >', 'Cosmetics'
-	gs 'intro_customization', 'modrel_setup2', 'stanok', 'Razors (number of shaves)'
-	gs 'intro_customization', 'modrel_setup2', 'krem', 'Sunblock'
-	gs 'intro_customization', 'modrel_setup2', 'hscrunch', 'Hair scrunchies'
-	gs 'intro_customization', 'modrel_setup2', 'hpingrip', 'Hair pins'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''razor'']', 'Razors (number of shaves)'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''suncream'']', 'Sunblock'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''scrunchies'']', 'Hair scrunchies'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''kirbygrips'']', 'Hair pins'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
 	$table_display
 	'</table></center>'
@@ -204,9 +204,9 @@ if $ARGS[0] = 'modite_pha':
 	gs 'intro_customization', 'modrel_setup2', 'painkiller', 'Painkillers'
 	gs 'intro_customization', 'modrel_setup2', 'mosolmaz', 'Ointment for chafing'
 	gs 'intro_customization', 'modrel_setup2', 'lubri', 'Lubricants'
-	gs 'intro_customization', 'modrel_setup2', 'lipbalm', 'Lip balms'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''lipbalm'']', 'Lip balms'
 	gs 'intro_customization', 'modrel_setup2', 'fatdel', 'Weight loss pills'
-	gs 'intro_customization', 'modrel_setup2', 'tampon', 'Tampons'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''tampons'']', 'Tampons'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''sanitary_pads'']', 'Sanitary napkins'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
 	$table_display

locations/mirror.qsrc

@@ -30,9 +30,9 @@ if $ARGS[0] = 'start':
 		if autohairbrush = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
 
 		!!!!!!!! Maruda Hair Mod
-		if hscrunch < 1:hscrunchw = 0
-		if hpingrip < 1:hpingripw = 0
-		if hscrunch < 2:hpigtail = 0
+		if mc_inventory['scrunchies'] < 1:hscrunchw = 0
+		if mc_inventory['kirbygrips'] < 1:hpingripw = 0
+		if mc_inventory['scrunchies'] < 2:hpigtail = 0
 
 		if pcs_hairbsh < 1: $serv['hairbrush']='<a href="exec: xgt ''mirror'', ''brush''"><img src="images/system/icons/action/hairbrush.png"></a>'
 		if pcs_hairlng > 80 and mc_inventory['scrunchies'] >= 1 and hbraids = 0: