Merge branch 'master' of azdraik/glife into master

[fixed] Case syncing of noShampoo

locations/core_library.qsrc

@@ -115,7 +115,7 @@ if $ARGS[0] = 'bathroom':
 			pcs_makeup = 1
 			minut += 10
 			pcs_mood += 10
-			noShampoo = 1
+			noshampoo = 1
 			dynamic $showerdin	
 			gs 'stat'
 			'You grab a quick shower, but you wish you could stay longer in the shower to let the heat soak into your muscles.'

locations/din_van.qsrc

@@ -31,7 +31,7 @@ $showerdin = {
 	if noshampoo = 0:
 		mc_inventory['shampoo'] -=  1
 	else
-		killvar 'noShampoo'
+		killvar 'noshampoo'
 	end
 	gs 'body', 'SkinGain', 'CleanSelf'
 	if false_lashes >= 1:
@@ -79,7 +79,7 @@ $shower = {
 		*clr & cla
 		minut += 15
 		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotelmc_inventory['shampoo'] =  1: noshampoo = 1
-		noShampoo_tmp = noShampoo
+		noshampoo_tmp = noshampoo
 		dynamic $showerdin
 
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'
@@ -93,10 +93,10 @@ $shower = {
 			'You''ve already gotten used to your feminine body and its softness doesn''t surprise you very much anymore, but you still let your hands wander a bit over your soft curves before you begin to wash yourself in earnest.'
 		else
 			pcs_horny += rand(0,2)
-			''+iif(noShampoo_tmp = 1, 'It''s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'lather yourself up, trying not to miss any spots, and then wash off.'
+			''+iif(noshampoo_tmp = 1, 'It''s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'lather yourself up, trying not to miss any spots, and then wash off.'
 		end
 
-		if mc_inventory['shampoo'] =  0 and noShampoo_tmp = 1:
+		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 mc_inventory['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.'
@@ -206,7 +206,7 @@ $shower = {
 			if locat['Fam_inGad'] = 0: gs 'vanrPar', 'peek'
 		end
 	end
-	killvar 'noShampoo_tmp'
+	killvar 'noshampoo_tmp'
 }
 
 $bath = {
@@ -218,7 +218,7 @@ $bath = {
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
 		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotelmc_inventory['shampoo'] =  1: noshampoo = 1
-		noShampoo_tmp = noShampoo
+		noshampoo_tmp = noshampoo
 		dynamic $showerdin
 
 		gs 'body', 'SkinGain', 'Bath'
@@ -237,10 +237,10 @@ $bath = {
 			'You have become a little accustomed to your female body and casually soap up all these soft curves and rinse yourself off, rubbing your hands all over your feminine body to make sure you didn''t miss a spot.'
 		else
 			pcs_horny += rand(0,2)
-			'You lean back and relax for a while. '+iif(noShampoo_tmp = 1, 'It’s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
+			'You lean back and relax for a while. '+iif(noshampoo_tmp = 1, 'It’s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
 		end
 
-		if mc_inventory['shampoo'] =  0 and noShampoo_tmp = 1:
+		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 mc_inventory['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.'
@@ -295,7 +295,7 @@ $bath = {
 
 		dynamic $brit
 	end
-	killvar 'noShampoo_tmp'
+	killvar 'noshampoo_tmp'
 }
 
 $SkinCare = {