Play testing and validation checks, this should fix most of the remaining syntax bugs. Logic testing now required.

locations/city_saunawhore.qsrc

@@ -364,18 +364,18 @@ if $ARGS[0] = 'bathroom':
 
 	if workDolg > 0 and mc_inventory['razor'] > 0:
 		*nl
-		'You have a handful of cheap razors you can use, enough for <<mc_inventory['razor']>> shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+		'You have a handful of cheap razors you can use, enough for <<mc_inventory[''razor'']>> shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 		dynamic $brit
 	elseif workDolg > 0 and mc_inventory['razor'] =  0:
 		*nl
-		'You have <<mc_inventory['razor']>> razors left. You should go to your room and ask for more.'
+		'You have <<mc_inventory[''razor'']>> razors left. You should go to your room and ask for more.'
 	elseif workDolg <= 0 and mc_inventory['razor'] > 0:
 		*nl
-		'Your current pack of razors will last for <b><<mc_inventory['razor']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+		'Your current pack of razors will last for <b><<mc_inventory[''razor'']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 		dynamic $brit
 	elseif workDolg = 0 and mc_inventory['razor'] =  0:
 		*nl
-		'You have <<mc_inventory['razor']>> razors left. You should to go to the store and buy more.'
+		'You have <<mc_inventory[''razor'']>> razors left. You should to go to the store and buy more.'
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $enema

locations/din_bad.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = 'd_bag':
 	'<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 mc_inventory['makeup_wipes'] > 0: 'You have <b><<mc_inventory['makeup_wipes']>></b> wet wipes left in your purse. <a href="exec:dynamic $d_salf">Use a tissue</a>'
+	if mc_inventory['makeup_wipes'] > 0: 'You have <b><<mc_inventory[''makeup_wipes'']>></b> wet wipes left in your purse. <a href="exec:dynamic $d_salf">Use a tissue</a>'
 	if painkiller > 0 and pain['total'] > 0 and pain['killer'] = 0: 
 		'You have <b><<painkiller>></b> painkiller'+iif(painkiller > 1, 's ', ' ')+'left in your purse. <a href="exec: pain[''killer''] += 1 & painkiller -= 1 & gs ''din_bad'', ''d_bag''">Take One</a>'
 	elseif painkiller > 0 and (pain['total'] = 0 or pain['killer'] > 0):

locations/din_van.qsrc

@@ -95,7 +95,7 @@ $shower = {
 		if mc_inventory['shampoo'] =  0 and noShampoo_tmp = 1:
 			'When you get a chance, you should stop by the supermarket and buy some shampoo.'
 		elseif shampoo <= 5:
-			'You are getting low on shampoo, with only <<mc_inventory['shampoo']>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
+			'You are getting low on shampoo, with only <<mc_inventory[''shampoo'']>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
 		end
 
 		if hypnoAddict > 0:'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
@@ -236,7 +236,7 @@ $bath = {
 		if mc_inventory['shampoo'] =  0 and noShampoo_tmp = 1:
 			'When you get a chance, you should stop by the supermarket and buy some shampoo.'
 		elseif shampoo <= 5:
-			'You are getting low on shampoo, with only <<mc_inventory['shampoo']>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
+			'You are getting low on shampoo, with only <<mc_inventory[''shampoo'']>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
 		end
 
 		if hypnoAddict > 0:'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
@@ -291,10 +291,10 @@ $bath = {
 }
 
 $SkinCare = {
-	if mc_inventory['moisturiser']  > 0 and mc_inventory['moisturiser']_time <= totminut:
+	if mc_inventory['moisturiser']  > 0 and item_moisturizer_time <= totminut:
 		act 'Apply Moisturizer (0:05)':
 			mc_inventory['moisturiser'] -= 1
-			! Moisturiser ware-off timer, so you can only use twice a day. Cleared in cikl so always available in morning
+			! Moisturiser wear-off timer, so you can only use twice a day. Cleared in cikl so always available in morning
 			mc_inventory['moisturiser'] = totminut + 10 * 60
 			menu_off = 1
 			*clr & cla
@@ -1019,7 +1019,7 @@ $palelady = {
 
 if $ARGS[0] = 'private':
 	menu_off = 0
-	if mc_inventory['razor'] > 0:'You have enough razors left for <b><<mc_inventory['razor']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	if mc_inventory['razor'] > 0:'You have enough razors left for <b><<mc_inventory[''razor'']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	if mc_inventory['razor'] > 0 and mc_inventory['razor'] <= 2 and razor['warning'] ! daystart:
 		razor['warning'] = daystart
 		msg'	You''re about to run out of razors!'
@@ -1027,17 +1027,17 @@ if $ARGS[0] = 'private':
 
 	if mosolmaz > 0: 'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
 	if mc_inventory['moisturiser'] > 0: 
-		'You look at your moisturiser and think you have about <<mc_inventory['moisturiser']>> applications left.'
+		'You look at your moisturiser and think you have about <<mc_inventory[''moisturiser'']>> applications left.'
 	end
 	if mc_inventory['tampons'] =  0 and mc_inventory['sanitary_pads'] = 0:
 		'<b><font color="red">You have no feminine hygiene products left.</font></b>'
 	elseif mc_inventory['tampons'] =  1 and tampon['warning'] ! daystart:
 		tampon['warning'] = daystart
-		msg'<font color="red">You only have <b><<mc_inventory['tampons']>></b> tampon left!</font>'
+		msg'<font color="red">You only have <b><<mc_inventory[''tampons'']>></b> tampon left!</font>'
 	elseif mc_inventory['tampons'] =  1:
-		msg'<font color="red">You only have <b><<mc_inventory['tampons']>></b> tampon left.</font>'
+		msg'<font color="red">You only have <b><<mc_inventory[''tampons'']>></b> tampon left.</font>'
 	elseif tampon > 0:
-		'You have <b><<mc_inventory['tampons']>></b> tampons.'
+		'You have <b><<mc_inventory[''tampons'']>></b> tampons.'
 	end
 	
 	if mc_inventory['sanitary_pads'] = 1 and tampon['warning'] ! daystart:
@@ -1067,7 +1067,7 @@ if $ARGS[0] = 'private':
 		dynamic $shower
 		dynamic $bath
 	elseif shampoo > 0:
-		'You have enough shampoo for <b><<mc_inventory['shampoo']>></b> uses.'
+		'You have enough shampoo for <b><<mc_inventory[''shampoo'']>></b> uses.'
 		dynamic $shower
 		dynamic $bath
 	else
@@ -1759,7 +1759,7 @@ if $ARGS[0] = 'shave_options':
 	end
 	
 	'</center></TD><TR><center>'
-	'Your razor will last for <b><<mc_inventory['razor']>></b> more shaves.'
+	'Your razor will last for <b><<mc_inventory[''razor'']>></b> more shaves.'
 	*nl
 	'<center><b>Change your shaving routine:</b></center>'
 	'<center><b>Note: Choosing to never shave, or to shave legs only, will remove your chosen shave style.<br> You can only choose a style if you currently have enough hair to support it.</b></center>'

locations/fit.qsrc

@@ -200,7 +200,7 @@ if $ARGS[0] = 'dressing_room':
 	end
 	
 	if mc_inventory['deodorant'] > 0 and deodorant_on = 0:
-		'Your deodorant will last you for <b><<mc_inventory['deodorant']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
+		'Your deodorant will last you for <b><<mc_inventory[''deodorant'']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1

locations/gadbana.qsrc

@@ -177,7 +177,7 @@ if mira_guest = 0:
 			end
 		end
 	end
-	if mc_inventory['razor'] > 0:'Your razor will last <b><<mc_inventory['razor']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
+	if mc_inventory['razor'] > 0:'Your razor will last <b><<mc_inventory[''razor'']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
 	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> on the window sill, which you can use to ' +iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	!WD: heal chafe
@@ -186,9 +186,9 @@ if mira_guest = 0:
 	if mc_inventory['tampons'] =  0 and mc_inventory['sanitary_pads'] = 0:
 		'<b><font color="red">You have no tampons left.</font></b>'
 	elseif mc_inventory['tampons'] =  1:
-		'<font color="red">You have only <b><<mc_inventory['tampons']>></b> tampon left.</font>'
+		'<font color="red">You have only <b><<mc_inventory[''tampons'']>></b> tampon left.</font>'
 	else
-		'You have <b><<mc_inventory['tampons']>></b> tampons.'
+		'You have <b><<mc_inventory[''tampons'']>></b> tampons.'
 	end
 	if mc_inventory['sanitary_pads'] = 0 and mc_inventory['tampons'] =  0:
 		'<b><font color="red">You have no pads left.</font></b>'

locations/gdksport.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if mc_inventory['deodorant'] > 0 and deodorant_on = 0:
-		'Your deodorant will last you for <b><<mc_inventory['deodorant']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
+		'Your deodorant will last you for <b><<mc_inventory[''deodorant'']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1

locations/gschool_lessons4.qsrc

@@ -1956,7 +1956,7 @@ if $ARGS[0] = 'post_dress':
 	act 'Use the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 	if mc_inventory['deodorant'] > 0 and deodorant_on = 0:
-		'Your deodorant will last you for <b><<mc_inventory['deodorant']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
+		'Your deodorant will last you for <b><<mc_inventory[''deodorant'']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1

locations/mirror.qsrc

@@ -495,9 +495,9 @@ $createcustroutine = {
 	*nl
 	'Choose if you will use lipbalm'
 	if custmc_inventory['lipstick']  = 0:
-		'You currently have no lip balm selected: <a href="exec:custmc_inventory['lipstick']  = 1 & dynamic $createcustroutine">Add Lipbalm to routine</a>'
+		'You currently have no lip balm selected: <a href="exec:custmc_inventory[''lipstick'']  = 1 & dynamic $createcustroutine">Add Lipbalm to routine</a>'
 	else
-		'You currently have lip balm selected: <a href="exec:custmc_inventory['lipstick']  = 0 & dynamic $createcustroutine">Remove Lipbalm to routine</a>'
+		'You currently have lip balm selected: <a href="exec:custmc_inventory[''lipstick'']  = 0 & dynamic $createcustroutine">Remove Lipbalm to routine</a>'
 	end
 	*nl
 	'Cycle lash options'
@@ -765,7 +765,7 @@ if $ARGS[0] = 'd_bag_mirror':
 	'<center><img <<$set_imgh>> src="/images/pc/items/mirror_compact.jpg"></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
-	'You have '+iif(mc_inventory['travel_makeup']  >0, '<b><<mc_inventory[''travel_makeup'']>></b>', 'no')+' cosmetic applications and '+iif(mc_inventory['makeup_wipes'] > 0, '<b><<mc_inventory['makeup_wipes']>></b>', 'no')+' tissues left in your purse.'
+	'You have '+iif(mc_inventory['travel_makeup']  >0, '<b><<mc_inventory[''travel_makeup'']>></b>', 'no')+' cosmetic applications and '+iif(mc_inventory['makeup_wipes'] > 0, '<b><<mc_inventory[''makeup_wipes'']>></b>', 'no')+' tissues left in your purse.'
 	*nl
 	if pcs_hairbsh < 1: '<a href="exec: pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
 	if mc_inventory['makeup_wipes'] > 0 and pcs_makeup ! 1 and cosmetic_tattoo = 0: '<center><a href="exec: mc_inventory[''makeup_wipes''] -= 1 & pcs_makeup = 1 & gt ''mirror'', ''d_bag_mirror''"><b>Remove your makeup</b></a>'

locations/stwork.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'toilet':
 	'You enter a dirty and smelly staff bathroom that''s probably never been cleaned.'
 	'There is no mirror, only a grimy shower, toilet and basin.'
 	*nl
-	'Your razor will last <b><<mc_inventory['razor']>></b> more ' + iif(mc_inventory['razor'] =  1, 'shave', 'shaves') + '. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	'Your razor will last <b><<mc_inventory[''razor'']>></b> more ' + iif(mc_inventory['razor'] =  1, 'shave', 'shaves') + '. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 
 	act 'Leave the bathroom':gt 'stwork', 'start'
 !	if mc_inventory['cosmetics'] >= 3: