Bläddra i källkod

The first migration of variables to a single arrange, all variables will be migrated to $mc_inventory and transition from a Russian/English mix to pure English to make it easier to track and debug variables within game code. The following variables have been migrated and will require bug testing to catch the edge case.

    $mc_inventory['cosmetics'] = kosmetica
    $mc_inventory['moisturiser'] = item_moisturizer
    $mc_inventory['lipstick'] = lipbalm
    $mc_inventory['eyelash_fake'] = falselashesplain
    $mc_inventory['eyelash_mink'] = falselashesmink
    $mc_inventory['razor'] = stanok
    $mc_inventory['suncream'] = krem
    $mc_inventory['deodorant'] = deodorant
    $mc_inventory['tampons'] = tampon
    $mc_inventory['sanitary_pads'] = sanpad
    $mc_inventory['shampoo'] = shampoo
    $mc_inventory['scrunchies'] = hscrunch
    $mc_inventory['kirbygrips'] = hpingrip
    $mc_inventory['makeup_wipes'] = salfetka
    $mc_inventory['mouthwash'] = mouthwash
    $mc_inventory['comb'] = greben
    $mc_inventory['travel_makeup'] = kosmetitka
    $mc_inventory['travel_mirror'] = compact_mirror
Hooded Silence 9 månader sedan
förälder
incheckning
15768d79d2
100 ändrade filer med 626 tillägg och 603 borttagningar
  1. 1 1
      locations/BDsex.qsrc
  2. 1 1
      locations/BelSex.qsrc
  3. 28 28
      locations/Cheatmenu_din.qsrc
  4. 2 2
      locations/Cum_Manage.qsrc
  5. 1 1
      locations/FedorEv4_sex.qsrc
  6. 2 2
      locations/HotelRoom.qsrc
  7. 1 1
      locations/JuliaMilHome.qsrc
  8. 3 3
      locations/KatjaHomeTalk.qsrc
  9. 1 1
      locations/LBZhouse.qsrc
  10. 2 2
      locations/LariskaHome.qsrc
  11. 2 2
      locations/Nudelake.qsrc
  12. 29 29
      locations/UnitAppearance.qsrc
  13. 2 2
      locations/VoltrenerSexShower.qsrc
  14. 1 1
      locations/Zvereva_house_events.qsrc
  15. 2 2
      locations/_stock_item_info.qsrc
  16. 22 22
      locations/abduction.qsrc
  17. 1 1
      locations/albina_house_events.qsrc
  18. 2 2
      locations/albina_starlets.qsrc
  19. 1 1
      locations/albina_wine_event.qsrc
  20. 2 2
      locations/arturend.qsrc
  21. 1 1
      locations/backwater.qsrc
  22. 2 2
      locations/barbershop.qsrc
  23. 2 2
      locations/body.qsrc
  24. 6 6
      locations/body_desc.qsrc
  25. 6 6
      locations/booty_call_after.qsrc
  26. 2 2
      locations/booty_call_morning.qsrc
  27. 13 13
      locations/booty_call_shower.qsrc
  28. 3 3
      locations/brothel.qsrc
  29. 1 1
      locations/brother_shower_sex.qsrc
  30. 27 27
      locations/brother_voyeur.qsrc
  31. 1 1
      locations/brother_voyeur_sex.qsrc
  32. 3 3
      locations/buklinik_event.qsrc
  33. 1 1
      locations/burger.qsrc
  34. 2 2
      locations/cikl.qsrc
  35. 6 6
      locations/city_apt_building.qsrc
  36. 1 1
      locations/city_irinaroom.qsrc
  37. 2 2
      locations/city_lake.qsrc
  38. 2 2
      locations/city_market.qsrc
  39. 1 1
      locations/city_pharmacy.qsrc
  40. 10 10
      locations/city_sauna.qsrc
  41. 6 6
      locations/city_saunawhore.qsrc
  42. 3 3
      locations/costuming.qsrc
  43. 25 25
      locations/din_bad.qsrc
  44. 39 39
      locations/din_van.qsrc
  45. 4 4
      locations/etoexhib.qsrc
  46. 4 4
      locations/fit.qsrc
  47. 11 11
      locations/foto.qsrc
  48. 9 9
      locations/foto_events.qsrc
  49. 1 1
      locations/foto_events2.qsrc
  50. 10 10
      locations/gadbana.qsrc
  51. 3 3
      locations/gadprostitutes.qsrc
  52. 6 6
      locations/gadriver.qsrc
  53. 3 3
      locations/gas_station_gp_117.qsrc
  54. 4 4
      locations/gdksport.qsrc
  55. 4 4
      locations/gschool_boys_bathroom.qsrc
  56. 2 2
      locations/gschool_girls_bathroom.qsrc
  57. 4 4
      locations/gschool_lessons4.qsrc
  58. 4 4
      locations/gschool_sex.qsrc
  59. 2 2
      locations/hairsalon.qsrc
  60. 5 5
      locations/hookup_after.qsrc
  61. 1 1
      locations/hookup_morning.qsrc
  62. 1 1
      locations/hookup_sex.qsrc
  63. 1 1
      locations/husbSex.qsrc
  64. 40 40
      locations/intro_city_select.qsrc
  65. 3 3
      locations/intro_customization.qsrc
  66. 45 45
      locations/intro_sg_select.qsrc
  67. 5 5
      locations/intro_sg_select_custom.qsrc
  68. 4 4
      locations/katjaEv.qsrc
  69. 2 2
      locations/katja_party.qsrc
  70. 1 1
      locations/kotovdom.qsrc
  71. 2 2
      locations/leonid.qsrc
  72. 2 2
      locations/lesbisubhouse.qsrc
  73. 6 6
      locations/mey_home.qsrc
  74. 1 1
      locations/mey_tamara_events.qsrc
  75. 4 4
      locations/mey_vika_events.qsrc
  76. 79 79
      locations/mirror.qsrc
  77. 3 3
      locations/mitkasex.qsrc
  78. 2 2
      locations/mother.qsrc
  79. 2 2
      locations/movie_studio.qsrc
  80. 1 1
      locations/natbelapt.qsrc
  81. 2 2
      locations/nichBathServant.qsrc
  82. 1 1
      locations/nichTaras.qsrc
  83. 3 3
      locations/pav_complexb2.qsrc
  84. 3 3
      locations/pav_complexb3.qsrc
  85. 2 2
      locations/pav_disco_sex.qsrc
  86. 2 2
      locations/pav_hotelReception.qsrc
  87. 2 2
      locations/pav_lake.qsrc
  88. 4 4
      locations/pav_lake_nude.qsrc
  89. 2 2
      locations/pav_pharmacy.qsrc
  90. 2 2
      locations/pav_train_market.qsrc
  91. 1 1
      locations/placer_sex.qsrc
  92. 4 4
      locations/pod_ezd.qsrc
  93. 2 2
      locations/pod_whore.qsrc
  94. 1 1
      locations/pornstudio.qsrc
  95. 1 1
      locations/post_events.qsrc
  96. 3 3
      locations/prostitution_pavlovsk.qsrc
  97. 3 3
      locations/road_prostitution.qsrc
  98. 7 7
      locations/rolanbath.qsrc
  99. 25 2
      locations/saveupdater.qsrc
  100. 4 4
      locations/sex_ev_after.qsrc

+ 1 - 1
locations/BDsex.qsrc

@@ -524,7 +524,7 @@ if $ARGS[0] = 'end':
 		pcs_horny += 1
 		pcs_hairbsh = 1
 		pcs_makeup = 1
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		'You go into the bathroom and turn on the shower, lathering body and washing as well as you can.'

+ 1 - 1
locations/BelSex.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'shower':
 	'<<$boydesc>> is finally done with you. He looks at you all pleased as you get up and head off to the bathroom to take a quick shower and freshen up.'
 	act 'Take a 15 minute shower':
 		cls
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		minut += 15
 		gs 'fame', 'pav', 'prostitute', 1

+ 28 - 28
locations/Cheatmenu_din.qsrc

@@ -644,10 +644,10 @@ $cheatmenu['permanent'] = {
 	'Peeing: <a href="exec:dynamic $cheatmenu[''pee'']"><<$cheatPee>></a>'
 
 	*nl
-	if Enable_autotampon = 1:
-		'Automatic cheat on Tampon: <a href="exec:Enable_autotampon = 0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'
+	if Enable_auto$mc_inventory['tampons'] =  1:
+		'Automatic cheat on Tampon: <a href="exec:Enable_auto$mc_inventory['tampons'] =  0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'
 	else
-		'Automatic cheat on Tampon: <a href="exec:Enable_autotampon = 1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
+		'Automatic cheat on Tampon: <a href="exec:Enable_auto$mc_inventory['tampons'] =  1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end
 	*nl
 	if Enable_nodream > 0:
@@ -3269,7 +3269,7 @@ $cheatmenu['items'] = {
 		*pl 'Lip balms: <a href="exec:lipbalm=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<lipbalm>> </b></a>'
 		*pl 'Weight loss pill: <a href="exec:fatdel=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<fatdel>> </b></a>'
 		*pl 'Tampons: <a href="exec:tampon=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<tampon>> </b></a>'
-		*pl 'Sanitary napkins: <a href="exec:sanpad=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<sanpad>> </b></a>'
+		*pl 'Sanitary napkins: <a href="exec:$mc_inventory['sanitary_pads']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['sanitary_pads']>> </b></a>'
 
 		if klisma = 0:
 			*pl 'Enema kit: <a href="exec:klisma = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
@@ -3331,37 +3331,37 @@ $cheatmenu['items'] = {
 
 	if showCosmeticsItems = 1:
 		'<a href = "exec: showCosmeticsItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
-		*pl 'Cosmetics: <a href="exec:kosmetica=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<kosmetica>> </b></a>'
-		*pl 'Moisturiser: <a href="exec:item_moisturizer=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<item_moisturizer>> </b></a>'
-		*pl 'Lip balms: <a href="exec:lipbalm=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<lipbalm>> </b></a>'
-		*pl 'Plain false lashes: <a href="exec:falselashesplain=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<falselashesplain>> </b></a>'
-		*pl 'Mink false lashes: <a href="exec:falselashesmink=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<falselashesmink>> </b></a>'
-		*pl 'Razors: <a href="exec:stanok=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<stanok>> </b></a>'
-		*pl 'Sunblock: <a href="exec:krem=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<krem>> </b></a>'
-		*pl 'Deodorant: <a href="exec:deodorant=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<deodorant>> </b></a>'
-		*pl 'Tampons: <a href="exec:tampon=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<tampon>> </b></a>'
-		*pl 'Sanitary Napkins: <a href="exec:sanpad=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<sanpad>> </b></a>'
-		*pl 'Shampoo: <a href="exec:shampoo=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<shampoo>> </b></a>'
-		*pl 'Hair scrunchies: <a href="exec:hscrunch=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<hscrunch>> </b></a>'
-		*pl 'Hair pins: <a href="exec:hpingrip=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<hpingrip>> </b></a>'
+		*pl 'Cosmetics: <a href="exec:$mc_inventory['cosmetics'] =input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['cosmetics']>> </b></a>'
+		*pl 'Moisturiser: <a href="exec:$mc_inventory['moisturiser']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<item_moisturizer>> </b></a>'
+		*pl 'Lip balms: <a href="exec:$mc_inventory['lipstick']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['lipstick'] >> </b></a>'
+		*pl 'Plain false lashes: <a href="exec:$mc_inventory['eyelash_fake']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['eyelash_fake']>> </b></a>'
+		*pl 'Mink false lashes: <a href="exec:$mc_inventory['eyelash_mink']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['eyelash_mink']>> </b></a>'
+		*pl 'Razors: <a href="exec:$mc_inventory['razor']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['razor']>> </b></a>'
+		*pl 'Sunblock: <a href="exec:$mc_inventory['suncream']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> << $mc_inventory['suncream']>> </b></a>'
+		*pl 'Deodorant: <a href="exec:$mc_inventory['deodorant']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['deodorant']>> </b></a>'
+		*pl 'Tampons: <a href="exec:$mc_inventory['tampons']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['tampons']>> </b></a>'
+		*pl 'Sanitary Napkins: <a href="exec:$mc_inventory['sanitary_pads']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['sanitary_pads']>> </b></a>'
+		*pl 'Shampoo: <a href="exec:$mc_inventory['shampoo']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<sha$mc_inventory['shampoo']mpoo>> </b></a>'
+		*pl 'Hair scrunchies: <a href="exec:$mc_inventory['scrunchies']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['scrunchies']>> </b></a>'
+		*pl 'Hair pins: <a href="exec:$mc_inventory['kirbygrips']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['kirbygrips']>> </b></a>'
 
 		if bag = 1:
-			*pl 'Wipes: <a href="exec:salfetka=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<salfetka>> </b></a>'
-			*pl 'Portable makeup: <a href="exec:kosmetitka=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<kosmetitka>> </b></a>'
-			*pl 'Mouthwash: <a href="exec:mouthwash=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mouthwash>> </b></a>'
+			*pl 'Wipes: <a href="exec:$mc_inventory['makeup_wipes']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['makeup_wipes']>> </b></a>'
+			*pl 'Portable makeup: <a href="exec:$mc_inventory['travel_makeup']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['travel_makeup']>> </b></a>'
+			*pl 'Mouthwash: <a href="exec:$mc_inventory['mouthwash']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<$mc_inventory['mouthwash']>> </b></a>'
 
-			if greben = 0:
-				*pl 'Comb: <a href="exec:greben = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+			if $mc_inventory['comb'] =  0:
+				*pl 'Comb: <a href="exec:$mc_inventory['comb'] =  1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 			end
-			if greben = 1:
-				*pl 'Comb: <a href="exec:greben = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+			if $mc_inventory['comb'] =  1:
+				*pl 'Comb: <a href="exec:$mc_inventory['comb'] =  0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 			end
 
-			if compact_mirror = 0:
-				*pl 'Compact mirror: <a href="exec:compact_mirror = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+			if $mc_inventory['travel_mirror'] =  0:
+				*pl 'Compact mirror: <a href="exec:$mc_inventory['travel_mirror'] =  1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 			end
-			if compact_mirror = 1:
-				*pl 'Compact mirror: <a href="exec:compact_mirror = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+			if $mc_inventory['travel_mirror'] =  1:
+				*pl 'Compact mirror: <a href="exec:$mc_inventory['travel_mirror'] =  0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 			end
 		end
 	end

+ 2 - 2
locations/Cum_Manage.qsrc

@@ -511,8 +511,8 @@ if $ARGS[0] = 'cumgather':
 			$part = 'unknown'
 		end
 
-		if salfetka > 0:
-			salfetka -= 1
+		if $mc_inventory['makeup_wipes'] > 0:
+			$mc_inventory['makeup_wipes'] -= 1
 			minut += 5
 			'You use a wipe to clean the sperm from your <<$part>>.'
 			gs 'cum_cleanup', 'cleanloc', cloc

+ 1 - 1
locations/FedorEv4_sex.qsrc

@@ -1837,7 +1837,7 @@ if $ARGS[0] = 'Shower 2':
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	'You climb into the shower and begin lathering your body, cleaning yourself as thoroughly as possible until you can hear Fedor enter the room and you peek out of the curtain to see him taking a piss and as soon as he notices you, he gives you a wink with a mischievous grin on his face.'
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 

+ 2 - 2
locations/HotelRoom.qsrc

@@ -144,7 +144,7 @@ end
 if $ARGS[0] = 'shower1':
 	*clr & cla
 	minut += 1
-	hotelShampoo = 1
+	hotel$mc_inventory['shampoo'] =  1
 	$locM_arg = 'shower1'
 	$locM = 'HotelRoom'
 	$loc_arg = 'shower1'
@@ -170,7 +170,7 @@ if $ARGS[0] = 'shower1':
 		end
 	else
 		act 'Return to your room':
-			hotelShampoo = 0
+			hotel$mc_inventory['shampoo'] =  0
 			if hotelRoom[$hotel] = 1:
 				gt'HotelRoom','normal'
 			elseif hotelRoom[$hotel] = 2:

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -319,7 +319,7 @@ if $ARGS[0] = 'bathroom':
 	act 'Take a shower':
 		menu_off = 1
 		minut += 10
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		gs 'stat'
 		

+ 3 - 3
locations/KatjaHomeTalk.qsrc

@@ -459,7 +459,7 @@ if $ARGS[0] = 'shower':
 
 		act 'Have a shower alone':
 			cla & *clr
-			noShampoo = 1
+			no$mc_inventory['shampoo'] =  1
 			dynamic $showerdin
 			minut += 15
 			pcs_hairbsh = 1
@@ -478,7 +478,7 @@ if $ARGS[0] = 'shower':
 
 		act 'Bathe together':
 			cla & *clr
-			noShampoo = 1
+			no$mc_inventory['shampoo'] =  1
 			dynamic $showerdin
 			pcs_hairbsh = 1
 			pcs_makeup = 1
@@ -539,7 +539,7 @@ if $ARGS[0] = 'shower':
 			end
 		end
 	else
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		minut += 15
 		pcs_hairbsh = 1

+ 1 - 1
locations/LBZhouse.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = 'Shower':
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	'You grab your stuff and walk over to the bathroom to have a shower. You carefully run the faucet, checking the water temperature before washing yourself off, enjoying the warm water hitting your body.'
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	minut += 15
 	pcs_hairbsh = 1

+ 2 - 2
locations/LariskaHome.qsrc

@@ -360,7 +360,7 @@ if $ARGS[0] = 'bathroom_join_2':
 	'You quickly strip your clothing off, and gently tap on the shower door. Startled, she turns to see you standing there, before smiling shyly and opening the door for you.'
 	
 	act 'Finish the shower':
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		minut += 15
 		pcs_horny += 10
@@ -403,7 +403,7 @@ if $ARGS[0] = 'bathroom_join_3':
 		gs 'arousal', 'end'
 		'As your body comes down from its high, she stands back up and kisses you some more. You taste yourself on her lips, you taste great! Eventually you break away to continue the shower.'
 		act 'Finish your shower':
-			noShampoo = 1
+			no$mc_inventory['shampoo'] =  1
 			dynamic $showerdin
 			minut += 5
 			pcs_horny += 10

+ 2 - 2
locations/Nudelake.qsrc

@@ -158,11 +158,11 @@ if $ARGS[0] = 'zagarat':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_nude.jpg"></center>'
 
-	if krem = 0:
+	if $mc_inventory['suncream'] =  0:
 		pcs_tan += 1
 		'You go to the beach and sunbathe.'
 	else
-		krem -= 1
+		$mc_inventory['suncream'] -=  1
 		pcs_tan += 3
 		'You smear sunblock on your body and sunbathe.'
 	end

+ 29 - 29
locations/UnitAppearance.qsrc

@@ -143,7 +143,7 @@ if $ARGS[0] = 'GenerateSvetas':
 	unitPShoQuality = PShoQuality
 	$unitpantyworntype = $pantyworntype
 	$unitbraworntype = $braworntype
-	unitpcs_lipbalm = pcs_lipbalm
+	unitpcs_$mc_inventory['lipstick']  = pcs_lipbalm
 	unitmopkoef = mopkoef
 	unitpcs_hairbsh = pcs_hairbsh
 	unitpcs_breath = pcs_breath
@@ -181,7 +181,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -219,7 +219,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -257,7 +257,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -295,7 +295,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -333,7 +333,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -371,7 +371,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 0
     unitpcs_breath = 0
@@ -409,7 +409,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -447,7 +447,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -485,7 +485,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -523,7 +523,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -561,7 +561,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -599,7 +599,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -637,7 +637,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -675,7 +675,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -713,7 +713,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -751,7 +751,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -789,7 +789,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -827,7 +827,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'none'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -865,7 +865,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPShoQuality = 0
     $unitpantyworntype = 'gm'
     $unitbraworntype = 'gm'
-    unitpcs_lipbalm = 0
+    unitpcs_$mc_inventory['lipstick']  = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -891,7 +891,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_vital = 100
     unitvidage = 20
     unitpcs_skin = 100
-    unitpcs_lipbalm = 1
+    unitpcs_$mc_inventory['lipstick']  = 1
     unitmopkoef = 30
     unitpcs_hairbsh = 1
     unitpcs_breath = 1
@@ -963,7 +963,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_vital = 30
     unitvidage = 16
     unitpcs_skin = 50
-    unitpcs_lipbalm = 1
+    unitpcs_$mc_inventory['lipstick']  = 1
     unitmopkoef = 19
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -1035,7 +1035,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_vital = 30
     unitvidage = 16
     unitpcs_skin = 50
-    unitpcs_lipbalm = 1
+    unitpcs_$mc_inventory['lipstick']  = 1
     unitmopkoef = 19
     unitpcs_hairbsh = 1
     unitpcs_breath = 0
@@ -1150,7 +1150,7 @@ if $ARGS[0] = 'GenerateSvetaOptions':
     unitpcs_skin = 100
     unitpcs_lashes = 5
     unitmopkoef = 30
-    unitpcs_lipbalm = 1
+    unitpcs_$mc_inventory['lipstick']  = 1
     unitlegkoef = 0
     gs 'UnitAppearance', 'calcHotcat', $svetadesc
     gs 'UnitAppearance', 'RestoreBase'
@@ -1200,7 +1200,7 @@ if $ARGS[0] = 'GenerateSvetaOptions':
     unitpcs_skin = 100
     unitpcs_lashes = 5
     unitmopkoef = 30
-    unitpcs_lipbalm = 1
+    unitpcs_$mc_inventory['lipstick']  = 1
     unitlegkoef = 0
     gs 'UnitAppearance', 'calcHotcat', $svetadesc
 
@@ -1269,7 +1269,7 @@ if $args[0] = 'SaloTest':
     unitpcs_vital = 100
     unitvidage = 20
     unitpcs_skin = 1
-    unitpcs_lipbalm = 1
+    unitpcs_$mc_inventory['lipstick']  = 1
     unitmopkoef = 5
     unitpcs_hairbsh = 1
     unitpcs_breath = 1
@@ -1450,7 +1450,7 @@ if $ARGS[0] = 'SaveBase':
     tunitPShoQuality = unitPShoQuality
     $tunitpantyworntype = $unitpantyworntype
     $tunitbraworntype = $unitbraworntype
-    tunitpcs_lipbalm = unitpcs_lipbalm
+    tunitpcs_$mc_inventory['lipstick']  = unitpcs_lipbalm
     tunitmopkoef = unitmopkoef
     tunitpcs_hairbsh = unitpcs_hairbsh
     tunitpcs_breath = unitpcs_breath
@@ -1488,7 +1488,7 @@ if $ARGS[0] = 'RestoreBase':
     unitPShoQuality = tunitPShoQuality
     $unitpantyworntype = $tunitpantyworntype
     $unitbraworntype = $tunitbraworntype
-    unitpcs_lipbalm = tunitpcs_lipbalm
+    unitpcs_$mc_inventory['lipstick']  = tunitpcs_lipbalm
     unitmopkoef = tunitmopkoef
     unitpcs_hairbsh = tunitpcs_hairbsh
     unitpcs_breath = tunitpcs_breath
@@ -1530,7 +1530,7 @@ if $ARGS[0] = 'CurVal':
 	'    unitPShoQuality = <<PShoQuality>>'
 	'    $unitpantyworntype = ''<<$pantyworntype>>'''
 	'    $unitbraworntype = ''<<$braworntype>>'''
-	'    unitpcs_lipbalm = <<pcs_lipbalm>>'
+	'    unitpcs_$mc_inventory['lipstick']  = <<pcs_lipbalm>>'
 	'    unitmopkoef = <<mopkoef>>'
 	'    unitpcs_hairbsh = <<pcs_hairbsh>>'
 	'    unitpcs_breath = <<pcs_breath>>'

+ 2 - 2
locations/VoltrenerSexShower.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = '3':
 					'You can see from the look in his eyes that he''s been at the wine, and his slurring and unsteady legs confirm this. "Your ass isn''t that special." He spits on you and stumbles out of the showers.'
 					gs 'stat'
 					act 'Wash your ass':
-						noShampoo = 1
+						no$mc_inventory['shampoo'] =  1
 						dynamic $showerdin
 						gt 'gdksport', 'start'
 					end
@@ -151,7 +151,7 @@ if $ARGS[0] = '3':
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Wash your ass':
-					noShampoo = 1
+					no$mc_inventory['shampoo'] =  1
 					dynamic $showerdin
 					gt 'gdksport', 'start'
 				end

+ 1 - 1
locations/Zvereva_house_events.qsrc

@@ -96,7 +96,7 @@ if $ARGS[0] = 'chris_shower':
 		'When she sees you, she opens the door and says "Get in here, I need my back washed."'
 		'You step inside, lather your hands in soap, and start washing her.'
 
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		pcs_horny += 10
 		pcs_hairbsh = 1

+ 2 - 2
locations/_stock_item_info.qsrc

@@ -19,7 +19,7 @@ $item_info['klisma'] = '<center><b>Enema kit</b></center><br>A medical tool for
 $item_info['lubri'] = '<center><b>Lubricant</b></center><br>A specialized gel used during sex and masturbation to ease penetration or reduce friction to or between the penis or sex toy and the vagina, anus, or other body parts.'
 $item_info['painkiller'] = '<center><b>Painkillers</b></center><br>A pack of pills containing drugs used to relieve pain. Some are taken recreationally for their mind-altering effects. Can be addictive.'
 $item_info['tampon'] = '<center><b>Tampons</b></center><br>A pack of cylinder-shape cotton swabs with a string that is capable of absorbing menstrual fluids during your period.'
-$item_info['sanpad'] = '<center><b>Sanitary napkins</b></center><br>A pack of absorbent towels that provide protection during your period. They attach to the inside of panties to avoid any leakage onto your clothes'
+$item_info['$mc_inventory['sanitary_pads']'] = '<center><b>Sanitary napkins</b></center><br>A pack of absorbent towels that provide protection during your period. They attach to the inside of panties to avoid any leakage onto your clothes'
 $item_info['breastpump'] = '<center><b>Breast Pump</b></center><br>A breast pump is a mechanical device that lactating women use to extract milk from their breasts. This is a manual model and comes with one bottle.'
 $item_info['bpbottles'] = '<center><b>Breastmilk Bottle S</b></center><br>Used to collect breast milk with a breast pump. This set contains three 150ml bottles.'
 $item_info['bpbottlem'] = '<center><b>Breastmilk Bottle M</b></center><br>Used to collect breast milk with a breast pump. This set contains two 250ml bottles.'
@@ -27,7 +27,7 @@ $item_info['bpnipplebalm'] = '<center><b>Nipplebalm</b></center><br>Nipplebalm i
 $item_info['fairy'] = '<center><b>Dishwashing detergent</b></center><br>A liquid dishwashing soap with a light almond scent. It claims to cut through grease and grime with ease AND leave your hands feeling soft and moisturized.'
 $item_info['poroshok'] = '<center><b>Clothing detergent</b></center><br>A box of powdered clothing detergent with a light flowery scent that leaves your clothes smelling fresh and clean.'
 $item_info['cltarelka'] = '<center><b>Plates</b></center><br>A set of five plain white dinner plates.'
-$item_info['kosmetica'] = '<center><b>Cosmetics</b></center><br>A complete cosmetic set that covers every part of your makeup routine. There is enough products in there to allow you to create various looks.'
+$item_info[$mc_inventory['cosmetics']] = '<center><b>Cosmetics</b></center><br>A complete cosmetic set that covers every part of your makeup routine. There is enough products in there to allow you to create various looks.'
 $item_info['stanok'] = '<center><b>Razors</b></center><br>Cheap and disposable razors. They are not meant to last very long, but they get the job done.'
 $item_info['pranik'] = '<center><b>Tea biscuits</b></center><br>A small package of yummy biscuits you can eat in a single sitting, perfect to be paired with a nice cup of tea'
 $item_info['siga'] = '<center><b>Pack of cigarettes</b></center><br>On the front in large print is a warning about potential health risks but it does not seem to stop some people from buying them...'

+ 22 - 22
locations/abduction.qsrc

@@ -48,22 +48,22 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 	painkiller_bak = painkiller
 	prezik_bak = prezik
 	vitamin_bak = vitamin
-	kosmetica_bak = kosmetica
-	lipbalm_bak = lipbalm
+	kosmetica_bak = $mc_inventory['cosmetics']
+	lipbalm_bak = $mc_inventory['lipstick']
 	tampon_bak = tampon
 	shampoo_bak = shampoo
-	stanok_bak = stanok
+	stanok_bak = $mc_inventory['razor']
 	deodorant_bak = deodorant
 
 	painkiller = 0
 	prezik = 0
 	vitamin = 0
-	kosmetica = 0
-	lipbalm = 0
-	tampon = 0
-	shampoo = 0
-	stanok = 0
-	deodorant = 0
+	$mc_inventory['cosmetics'] = 0
+	$mc_inventory['lipstick']  = 0
+	$mc_inventory['tampons'] =  0
+	$mc_inventory['shampoo'] =  0
+	$mc_inventory['razor'] =  0
+	$mc_inventory['deodorant'] =  0
 
 	tabletkishot = rand(84,91)
 	shotdays = 93
@@ -557,12 +557,12 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	painkiller = painkiller_bak
 	prezik = prezik_bak
 	vitamin = vitamin_bak
-	kosmetica = kosmetica_bak
-	lipbalm = lipbalm_bak
-	tampon = tampon_bak
-	shampoo = shampoo_bak
-	stanok = stanok_bak
-	deodorant = deodorant_bak
+	$mc_inventory['cosmetics'] = kosmetica_bak
+	$mc_inventory['lipstick']  = lipbalm_bak
+	$mc_inventory['tampons'] =  tampon_bak
+	$mc_inventory['shampoo'] =  shampoo_bak
+	$mc_inventory['razor'] =  stanok_bak
+	$mc_inventory['deodorant'] =  deodorant_bak
 
 	act 'Turn and run the opposite direction':gt 'road'
 	act 'Run left':gt 'city_industrial'
@@ -675,7 +675,7 @@ if $ARGS[0] = 'abdFood':
 		menu_off = 1
 		minut += 15
 		pcs_horny += 1
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/shower1.jpg"></center>'
@@ -1091,12 +1091,12 @@ if $ARGS[0] = 'abdSoldSauna':
 	painkiller = painkiller_bak
 	prezik = prezik_bak
 	vitamin = vitamin_bak
-	kosmetica = kosmetica_bak
-	lipbalm = lipbalm_bak
-	tampon = tampon_bak
-	shampoo = shampoo_bak
-	stanok = stanok_bak
-	deodorant = deodorant_bak
+	$mc_inventory['cosmetics'] = kosmetica_bak
+	$mc_inventory['lipstick']  = lipbalm_bak
+	$mc_inventory['tampons'] =  tampon_bak
+	$mc_inventory['shampoo'] =  shampoo_bak
+	$mc_inventory['razor'] =  stanok_bak
+	$mc_inventory['deodorant'] =  deodorant_bak
 
 	act 'Continue':gt 'city_sauna', 'saunaroom'
 end

+ 1 - 1
locations/albina_house_events.qsrc

@@ -419,7 +419,7 @@ if $ARGS[0] = 'after_swim_shower':
 				'"Use whatever you want in there. There''s towels in the cupboard," she says before disappearing into her bedroom. You walk down to the bathroom, enter and place your clothes in a neat pile. You turn the shower on and lock the door as you wait for the water. When it''s the right temperature, you step in and start washing yourself.'
 				act 'Shower':
 					cla & *clr
-					shampoo += 1
+					$mc_inventory['shampoo'] +=  1
 					'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 					'A lot of expensive looking stuff litters the shelves, but you limit yourself to using only what you need.'
 					*nl

+ 2 - 2
locations/albina_starlets.qsrc

@@ -319,7 +319,7 @@ if $ARGS[0] = 'starlets':
 					'The performance goes smoothly and you and the other Starlets leave the stage, where Albina distributes the money while everyone takes turns using the single shower in the dressing room.'
 					act 'Shower':
 						cla & *clr
-						noShampoo = 1
+						no$mc_inventory['shampoo'] =  1
 						dynamic $showerdin
 						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
@@ -1487,7 +1487,7 @@ if $ARGS[0] = 'parkrally':
 		gs 'exercise', 'tier2', 0, 'agil', 'danc'
 		profiDanceTime += 1
 		inhib_exp += rand(3,5)
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting3.jpg"></center>'

+ 1 - 1
locations/albina_wine_event.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'wine_invite':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 				'You wash up in Albina''s shower, scrubbing the chlorine off your skin before drying off and putting on your clothes.'
-				shampoo += 1
+				$mc_inventory['shampoo'] +=  1
 				dynamic $showerdin
 				act 'Head out':
 					cla & *clr

+ 2 - 2
locations/arturend.qsrc

@@ -26,10 +26,10 @@ act 'Brush up':
 		arturgift = rand(0, 2)
 
 		if arturgift = 0:
-			kosmetitka += 20
+			$mc_inventory['travel_makeup'] +=  20
 			'Arthur hands you a portable set of cosmetics.'
 		elseif arturgift = 1:
-			kosmetica += 20
+			$mc_inventory['cosmetics'] += 20
 			'Arthur gives you a set of cosmetics.'
 		elseif arturgift = 2:
 			money += 1000

+ 1 - 1
locations/backwater.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'alone':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($pantyworntype = 'none','backwaterswim2.jpg','backwaterswim1.jpg')+'"></center>'
 			*nl 'You washed in the creek.'
 			menu_off = 1
-			noShampoo = 1
+			no$mc_inventory['shampoo'] =  1
 			dynamic $showerdin
 			face_write = 0
 			body_write = 0

+ 2 - 2
locations/barbershop.qsrc

@@ -99,7 +99,7 @@ if money >= 60:
 		*clr & cla
 		menu_off = 1
 		money -= 60
-		hscrunch += 10
+		$mc_inventory['scrunchies'] +=  10
 		'You pay Mr. Syomin and buy the small box.'
 
 		act 'Move away':gt 'barbershop', 'start'
@@ -111,7 +111,7 @@ if money >= 80:
 		*clr & cla
 		menu_off = 1
 		money -= 80
-		hpingrip += 10
+		$mc_inventory['kirbygrips'] +=  10
 		'You pay Mr. Syomin and buy the small box.'
 
 		act 'Move away':gt 'barbershop', 'start'

+ 2 - 2
locations/body.qsrc

@@ -117,10 +117,10 @@ if $ARGS[0] = 'DailyUpdate':
 
 	if pcs_pubes < 2: pcs_pubecol[2] = pcs_pubecol
 
-	if hscrunch > 0:
+	if $mc_inventory['scrunchies'] > 0:
 		hscrunchrand = rand(1, 100)
 
-		if hscrunchrand <= 8:hscrunch -= 1
+		if hscrunchrand <= 8:$mc_inventory['scrunchies'] -=  1
 	end
 
 	! Leg and pubes hair growth

+ 6 - 6
locations/body_desc.qsrc

@@ -455,26 +455,26 @@ if $ARGS[0] = 'lips':
 		$pc_desc['lip gloss'] = func($this, 'ChooseDescWord', 'shiny', 'glossy', 'juicy', 'slippery')
 		$pc_desc['lip glossed'] = 'glossed'
 		if pcs_lip = 1:
-			$pcs_lipbalm = 'shiny'
+			$pcs_$mc_inventory['lipstick']  = 'shiny'
 			$pc_descWordy['lip glossed'] = 'gloss-slicked'
 		elseif pcs_lip = 2:
-			$pcs_lipbalm = 'brilliant and juicy'
+			$pcs_$mc_inventory['lipstick']  = 'brilliant and juicy'
 			$pc_descWordy['lip glossed'] = 'invitingly glossed'
 		elseif pcs_lip = 3:
-			$pcs_lipbalm = 'juicy and full'
+			$pcs_$mc_inventory['lipstick']  = 'juicy and full'
 			$pc_descWordy['lip glossed'] = 'wetly-glossed'
 		elseif pcs_lip = 4:
-			$pcs_lipbalm = 'wet and glossy'
+			$pcs_$mc_inventory['lipstick']  = 'wet and glossy'
 			$pc_descWordy['lip glossed'] = 'suggestively gloss-glazed'
 		else
 			!! Lip size 0
-			$pcs_lipbalm = 'shiny'
+			$pcs_$mc_inventory['lipstick']  = 'shiny'
 			$pc_descWordy['lip glossed'] = 'gloss-slicked'
 		end
 	else
 		!! No gloss
 		$pc_desc['lip gloss'] = 'soft'
-		$pcs_lipbalm = 'soft'
+		$pcs_$mc_inventory['lipstick']  = 'soft'
 		$pc_desc['lip glossed'] = 'softened'
 	end
 

+ 6 - 6
locations/booty_call_after.qsrc

@@ -864,7 +864,7 @@ if $ARGS[0] = 'cum_clean':
 				end
 			end
 			
-			if salfetka > 0:
+			if $mc_inventory['makeup_wipes'] > 0:
 				act'Use your wipes':
 					gs 'cum_cleanup', 'cleanloc'
 					gs'stat'
@@ -1078,10 +1078,10 @@ if $ARGS[0] = 'after_sex2':
 	end
 
 	if $stat_cum_msg ! '':
-		if salfetka > 0:
+		if $mc_inventory['makeup_wipes'] > 0:
 			act'Clean yourself up (use your own wipes)':
 				booty_call['wipes'] = 1
-				salfetka -= 1
+				$mc_inventory['makeup_wipes'] -= 1
 				gt'booty_call_after', 'wipes'
 			end
 		end
@@ -1169,11 +1169,11 @@ if $ARGS[0] = 'boy_bathroom':
 			act'Take a shower':gs'booty_call_morning', 'shower'
 		end
 	end
-	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
+	if $mc_inventory['sanitary_pads'] > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
 		act 'Use a sanitary pad (0:02)':
 			menu_off = 1
 			*clr & cla
-			sanpad -= 1
+			$mc_inventory['sanitary_pads'] -=  1
 			isprokp = 1
 			minut += 2
 			pcs_mood -= 5
@@ -1187,7 +1187,7 @@ if $ARGS[0] = 'boy_bathroom':
 		act 'Use a tampon (0:02)':
 			menu_off = 1
 			*clr & cla
-			tampon -= 1
+			$mc_inventory['tampons'] -=  1
 			isprok = 1
 			minut += 2
 			pcs_mood -= 5

+ 2 - 2
locations/booty_call_morning.qsrc

@@ -675,7 +675,7 @@ if $ARGS[0] = 'shower2':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	minut += 10
-	shampoo += 1
+	$mc_inventory['shampoo'] +=  1
 	dynamic $showerdin
 	gs'stat'
 	'You twist the faucet and hot water comes rushing out, pouring over you, soaking into your skin. Slowly over time, your sleepiness washes away and clarity comes back.'
@@ -692,7 +692,7 @@ if $ARGS[0] = '2nd_shower':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		minut += 5
-		shampoo += 1
+		$mc_inventory['shampoo'] +=  1
 		dynamic $showerdin
 		gs'stat'
 		'You get into <<$npc_firstname[$boy]>>''s shower for the <i>second</i> time this morning, washing the sex sweat from your body.'

+ 13 - 13
locations/booty_call_shower.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = 'before_alone':
 	minut += 5
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	booty_call['start_shower'] = 1
 	gs 'stat'
@@ -94,7 +94,7 @@ end
 
 if $ARGS[0] = 'before_together1':
 	booty_call['start_shower'] = 1
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	gs'arousal', 'massage',5,'no_orgasm_msg'
 	gs'stat'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'before_jerkoff_cum1':
 		'You work him even harder, trying to finish him with one final sprint. <<$npc_firstname[$boy]>> grunts and cum explodes from his tip. The sensation of his cum spattering across your stomach is the last thing you need and you come as well, moaning loudly even as you continue to finish him off.'
 	end
 	act'Continue':
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/after2.mp4"></video></center>'
@@ -514,7 +514,7 @@ end
 
 if $ARGS[0] = 'after_borrow_shower':
 	cla & *clr
-	NoShampoo = 1
+	No$mc_inventory['shampoo'] =  1
 	$npc_apt_bedroom[$boy]
 	'"I''m gonna borrow your shower," you say, sliding out of the bed.'
 	if rand(1,10) < npc_sexdrive[$boy] and booty_call['angry_after'] = 0:
@@ -573,7 +573,7 @@ if $ARGS[0] = 'after_alone':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	booty_call['shower'] = 1
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	gs 'stat'
 	'You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off and step out.'
@@ -631,7 +631,7 @@ end
 
 if $ARGS[0] = 'after_shower_together':
 	booty_call['shower'] = 1
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	cla & *clr
 	gs 'stat'
@@ -1109,7 +1109,7 @@ if $ARGS[0] = 'after_shower_cum_rinse':
 		act'Rinse off':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-			noShampoo = 1
+			no$mc_inventory['shampoo'] =  1
 			dynamic $showerdin
 			$orgasm_or = 'no'
 			gs'arousal', 'vaginal_finger',rand(1,2),'no_orgasm_msg', 'masturbate'
@@ -1135,7 +1135,7 @@ if $ARGS[0] = 'after_shower_again':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			minut += 5
-			noShampoo = 1
+			no$mc_inventory['shampoo'] =  1
 			dynamic $showerdin
 			gs'stat'
 			if booty_call['shower_fuck'] = 1:
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'after_shower_again_long':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			minut += 15
-			noShampoo = 1
+			no$mc_inventory['shampoo'] =  1
 			dynamic $showerdin
 			gs'stat'
 			if booty_call['shower_creampie'] = 1:
@@ -1181,7 +1181,7 @@ if $ARGS[0] = 'after_shower_again_long':
 end
 
 if $ARGS[0] = 'after_shower_together_end':
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	cla & *clr
 	$npc_apt_bathroom[$boy]
@@ -1416,7 +1416,7 @@ if $ARGS[0] = 'morning_together_sex1':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
 		gs 'arousal', 'foreplay', 10
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		'You stay in the shower with <<$npc_firstname[$boy]>> a while longer, allowing him to keep playing with your breasts and fondling your body, but don''t let it progress any further until the water shuts off.'
 		*nl
@@ -1465,7 +1465,7 @@ if $ARGS[0] = 'morning_jerkoff_cum1':
 		'You turn to face him, staring into <<$npc_firstname[$boy]>>''s eyes as you work him even harder trying to finish him with one final sprint. <<$npc_firstname[$boy]>> grunts and cum explodes from his tip. The sensation of his cum spattering across your stomach is the last thing you need and you come as well, moaning loudly even as you continue to finish him off.'
 	end
 	act'Continue':
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/after2.mp4"></video></center>'
@@ -1772,7 +1772,7 @@ if $ARGS[0] = 'morning_shower_fuck_jerkoff_end':
 end
 
 if $ARGS[0] = 'morning_shower_together_end':
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	act'Finish up':
 		cla

+ 3 - 3
locations/brothel.qsrc

@@ -543,7 +543,7 @@ if $ARGS[0] = 'brothel_dressingroom':
 	 *nl
 	'A room made for the working girls, like yourself.'
 	'It is equipped with a shower, almost on every wall hangs a large <a href="exec:gt ''mirror'', ''start''">mirror</a>. There is a water cooler beside the door, and some light snacks on the table, in case the girls get hungry or thirsty between sessions.'
-	'From a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $loc_arg">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(shampoo < 1,'<a href="exec: shampoo += 5 & gt ''brothel'', $loc_arg">shampoo</a>','shampoo')+', '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $loc_arg">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $loc_arg">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	'From a box beneath a table you can take some '+iif($mc_inventory['cosmetics'] < 1,'<a href="exec: $mc_inventory['cosmetics'] += 5 & gt ''brothel'', $loc_arg">cosmetics</a>','cosmetics')+' (you have '+$mc_inventory['cosmetics'] >+') or, '+iif(shampoo < 1,'<a href="exec: $mc_inventory['shampoo'] +=  5 & gt ''brothel'', $loc_arg">shampoo</a>','shampoo')+', '+iif(lipbalm < 1,'<a href="exec: $mc_inventory['lipstick'] += 5 & gt ''brothel'', $loc_arg">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif($mc_inventory['razor'] < 1,'<a href="exec: $mc_inventory['razor'] +=  5 & gt ''brothel'', $loc_arg">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	'For obvious reasons there is also a box with an '+iif(klisma < 1,'<a href="exec: klisma += 1 & gt ''brothel'', $loc_arg">enema kit</a>','enema kit')+'. A box with some '+iif(painkiller < 1,'<a href="exec: painkiller += 5 & gt ''brothel'', $loc_arg">painkillers</a>','painkillers')+' (you have '+painkiller+') is there, in case someone needs pain relief.'
 	'On the table lies a list with instructions, in case you don''t already remember them:'
 	*nl
@@ -575,7 +575,7 @@ if $ARGS[0] = 'brothel_dressingroom':
 			'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible to potential clients.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			dynamic $dryOff
-			if stanok > 0: dynamic $brit
+			if $mc_inventory['razor'] > 0: dynamic $brit
 		end
 	else
 	  !!Changed from buying to taking from the box, since shampoo is handed out for free at this location
@@ -588,7 +588,7 @@ if $ARGS[0] = 'brothel_dressingroom':
 	dynamic $quickwash
 	dynamic $basin
 	dynamic $publicpan
-	if stanok > 0: dynamic $brit
+	if $mc_inventory['razor'] > 0: dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':
 			pain['killer'] += 1

+ 1 - 1
locations/brother_shower_sex.qsrc

@@ -1327,7 +1327,7 @@ end
 
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	brother_shower_times += 1
 	minut += 2

+ 27 - 27
locations/brother_voyeur.qsrc

@@ -687,7 +687,7 @@ if $ARGS[0] = 'brother_wash':
 			'As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pc_desc[''pubes'']>> pussy.'
 		end
 		'"Aren''t you going to shave?"'
-		if stanok = 0:
+		if $mc_inventory['razor'] =  0:
 			act'"I can''t. I don''t have any razors"':
 				cla & *nl
 				brothershave[1] = daystart + 2
@@ -779,7 +779,7 @@ if $ARGS[0] = 'brother_shower_shave':
 		'"Yeah, you''re probably right. I should shave," you say looking down at yourself, frowning at the growing body hair.'
 	end
 	
-	if pcs_leghair > 3 and pcs_pubes > 3 and stanok = 1:
+	if pcs_leghair > 3 and pcs_pubes > 3 and $mc_inventory['razor'] =  1:
 		msg'As you pick up your razor, you realize that it''s probably only sharp enough for one more use. You''ll have to decide between a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
 	else
 		*nl
@@ -797,7 +797,7 @@ if $ARGS[0] = 'brother_shower_shave':
 end
 
 if $ARGS[0] = 'shave_both':
-	if stanok >= 2:
+	if $mc_inventory['razor'] >= 2:
 		if pcs_leghair > 3 and pcs_pubes > 3:
 			act 'Shave your legs and pussy (0:15)':
 				npc_rel['A34'] += 3
@@ -807,7 +807,7 @@ if $ARGS[0] = 'shave_both':
 				pcs_pubes = 0
 				pcs_horny += 5
 				brothershave += 1
-				stanok -= 2
+				$mc_inventory['razor'] -=  2
 				'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
 				'"Yeah, sure. Why not?" you smile.'
 				'You lather up your legs and crotch and then start carefully shaving them. Kolka stares at you and watches the process intently.'
@@ -853,14 +853,14 @@ if $ARGS[0] = 'shave_legs':
 			minut += 5
 			pcs_leghair = 0
 			pcs_horny += 5
-			stanok -= 1
+			$mc_inventory['razor'] -=  1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 			'You lather up your legs and then start carefully shaving them.'
 			*nl
 			if pcs_pubes > 3:
 				'Kolka frowns. "You''re not going to shave your '+iif(pcs_pubes <= 20, 'pussy?"', 'bush?"')
-				if stanok = 0:
+				if $mc_inventory['razor'] =  0:
 					act'"I can''t. Razor''s gone dull"':
 						cla & *nl
 						'"I couldn''t even if I wanted to," you say to him wistfully. He looks at you in confusion. "Razor''s gone dull." You thumb the razor to show him. Need a sharp razor to shave. <i>Especially</i> down there," you smile.'
@@ -956,7 +956,7 @@ if $ARGS[0] = 'shave_legs':
 						pcs_horny += 5
 						brothershave += 1
 						minut += 5
-						stanok -= 1
+						$mc_inventory['razor'] -=  1
 						gs 'stat'
 						'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
 						'"Hmm..." You think to yourself for a moment. "Maybe you''re right after all," you say and start lathering up your crotch.'
@@ -999,7 +999,7 @@ if $ARGS[0] = 'shave_pussy':
 				pcs_pubes = 0
 			end
 			pcs_horny += 5
-			stanok -= 1
+			$mc_inventory['razor'] -=  1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 			if brother_shower['shave_ask2'] = daystart:
@@ -1011,7 +1011,7 @@ if $ARGS[0] = 'shave_pussy':
 			
 			if pcs_leghair > 3:
 				'Kolka frowns. "You''re not going to shave your legs?"'
-				if stanok = 0:
+				if $mc_inventory['razor'] =  0:
 					act'"I can''t. Razor''s gone dull"':
 						cla & *nl
 						'"I couldn''t even if I wanted to," you say to him wistfully. He looks at you in confusion. "Razor''s gone dull." You thumb the razor to show him. Need a sharp razor to shave. <i>Especially</i> down there," you smile.'
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'shave_pussy':
 						pcs_horny += 5
 						brothershave += 1
 						minut += 5
-						stanok -= 1
+						$mc_inventory['razor'] -=  1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 						'"Hmm..." You think to yourself for a moment. "Maybe you''re right after all," you say and start lathering up your legs and begin carefully shaving them.'
@@ -1253,7 +1253,7 @@ if $ARGS[0] = 'shave':
 		elseif pcs_leghair > 3 and pcs_pubes <= 3:
 			'His lips twisted in thought, he says, "You''re looking a little hairy down there." You follow his gaze to look at your <<$pc_desc[''legs'']>> legs. "Aren''t you going to shave?"'
 		end
-		if stanok = 0:
+		if $mc_inventory['razor'] =  0:
 			act'"I can''t. I don''t have any razors"':
 				cla
 				*nl
@@ -1263,7 +1263,7 @@ if $ARGS[0] = 'shave':
 			end
 
 		else
-			if pcs_leghair > 3 and pcs_pubes > 3 and stanok = 1:
+			if pcs_leghair > 3 and pcs_pubes > 3 and $mc_inventory['razor'] =  1:
 				msg 'As you pick up your razor, you realize that it''s probably only sharp enough for shaving one set of things. If you want to shave you''ll have to decide between keeping a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
 			end
 
@@ -1315,7 +1315,7 @@ if $ARGS[0] = 'shave':
 				end
 			end
 
-			if pcs_leghair > 3 and pcs_pubes > 3 and stanok > 1:
+			if pcs_leghair > 3 and pcs_pubes > 3 and $mc_inventory['razor'] > 1:
 				act 'Shave your legs and pussy (0:15)':
 					cla & *clr
 					minut += 15
@@ -1323,7 +1323,7 @@ if $ARGS[0] = 'shave':
 					pcs_pubes = 0
 					pcs_horny += 5
 					brothershave += 1
-					stanok -= 2
+					$mc_inventory['razor'] -=  2
 					inhib_exp += rand(1,3)
 					gs 'stat'
 					'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
@@ -1346,7 +1346,7 @@ if $ARGS[0] = 'shave':
 					minut += 5
 					pcs_leghair = 0
 					pcs_horny += 5
-					stanok -= 1
+					$mc_inventory['razor'] -=  1
 					inhib_exp += rand(1,2)
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
@@ -1354,7 +1354,7 @@ if $ARGS[0] = 'shave':
 					'You lather up your legs and then start carefully shaving them.'
 					if pcs_pubes > 3:
 						'Kolka frowns. "You''re not going to shave your pussy?"'
-						if stanok = 0:
+						if $mc_inventory['razor'] =  0:
 							act'"I can''t. Razor''s gone dull"':
 								cla
 								*nl
@@ -1413,7 +1413,7 @@ if $ARGS[0] = 'shave':
 								pcs_horny += 5
 								brothershave += 1
 								minut += 5
-								stanok -= 1
+								$mc_inventory['razor'] -=  1
 								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
 								if pcs_pubes < 11:
 									'<br>"Hmm..." You think to yourself for a moment. "Maybe you''re right after all," you say and start lathering up your crotch.<br>Kolka stares at you intensely as you carefully remove the bits of stubble from around your pussy.'
@@ -1447,7 +1447,7 @@ if $ARGS[0] = 'shave':
 					pcs_horny += 5
 					brothershave += 1
 					minut += 5
-					stanok -= 1
+					$mc_inventory['razor'] -=  1
 					inhib_exp += 1
 					gs 'stat'
 					'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
@@ -1500,11 +1500,11 @@ if $ARGS[0] = 'shave':
 		end
 	else
 		'<center><video autoplay loop src="images/shared/home/bathroom/brothershowertalk.mp4"></center>'
-		if pcs_leghair >= 4 and pcs_pubes >= shave_trigger and stanok > 0:
+		if pcs_leghair >= 4 and pcs_pubes >= shave_trigger and $mc_inventory['razor'] > 0:
 			'While rinsing off, you notice your legs and pussy could use a shave. You look up and Kolka is still looking at the wall.'
-		elseif pcs_leghair < 4 and pcs_pubes >= shave_trigger and stanok > 0:
+		elseif pcs_leghair < 4 and pcs_pubes >= shave_trigger and $mc_inventory['razor'] > 0:
 			'While rinsing off, you notice that your pussy could use a shave. You look up and Kolka is still looking at the wall.'
-		elseif pcs_leghair >= 4 and pcs_pubes < shave_trigger and stanok > 0:
+		elseif pcs_leghair >= 4 and pcs_pubes < shave_trigger and $mc_inventory['razor'] > 0:
 			'While rinsing off, you notice your legs could use a shave. You look up and Kolka is still looking at the wall.'
 		end
 		'Do you want to shave right now?'
@@ -1515,7 +1515,7 @@ if $ARGS[0] = 'shave':
 			act'Dry off':gt'brother_voyeur','dryoff'
 		end
 
-		if stanok > 1 and pcs_leghair > 3 and pcs_pubes > 3:
+		if $mc_inventory['razor'] > 1 and pcs_leghair > 3 and pcs_pubes > 3:
 			act'Shave your legs and pussy (0:15)':
 				cla & *clr
 				minut += 15
@@ -1526,7 +1526,7 @@ if $ARGS[0] = 'shave':
 					pcs_pubes = 0
 				end
 				pcs_horny += 5
-				stanok -= 2
+				$mc_inventory['razor'] -=  2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 				'You casually continue the conversation with your brother while lathering up your legs and crotch before starting to carefully shave them. You notice your brother make a few curious peeks but decide not to say anything and simply continue on with your business and the conversation.'
@@ -1535,13 +1535,13 @@ if $ARGS[0] = 'shave':
 			end
 		end
 
-		if stanok > 0 and pcs_leghair > 3:
+		if $mc_inventory['razor'] > 0 and pcs_leghair > 3:
 			act'Shave your legs (0:05)':
 				*clr & cla
 				minut += 5
 				pcs_leghair = 0
 				pcs_horny += 5
-				stanok -= 1
+				$mc_inventory['razor'] -=  1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 				'You casually continue the conversation with your brother while lathering up your legs before starting to carefully shave them. You notice your brother make a few curious peeks but decide not to say anything and simply continue on with your business and the conversation.'
@@ -1550,7 +1550,7 @@ if $ARGS[0] = 'shave':
 			end
 		end
 
-		if stanok > 0 and pcs_pubes > 3:
+		if $mc_inventory['razor'] > 0 and pcs_pubes > 3:
 			act'Shave your pussy (0:10)':
 				cla
 				*clr
@@ -1561,7 +1561,7 @@ if $ARGS[0] = 'shave':
 					pcs_pubes = 0
 				end
 				pcs_horny += 5
-				stanok -= 1
+				$mc_inventory['razor'] -=  1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 				'You casually continue the conversation with your brother while lathering up the area between your legs before starting to carefully shave it. You notice your brother make a few curious peeks but you decide not to say anything and simply continue on with your business and the conversation.'

+ 1 - 1
locations/brother_voyeur_sex.qsrc

@@ -1377,7 +1377,7 @@ end
 
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	brother_shower_times += 1
 	minut += 2

+ 3 - 3
locations/buklinik_event.qsrc

@@ -883,7 +883,7 @@ if $ARGS[0] = 'event2':
 															act'Well on this we''re finished':
 																cls
 																nanny_vika = 1
-																noShampoo = 1
+																no$mc_inventory['shampoo'] =  1
 																dynamic $showerdin
 																'You take a quick shower and get dressed, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 																if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -958,7 +958,7 @@ if $ARGS[0] = 'event2':
 									cls
 									nanny_vika = 1
 									gs'stat'
-									noShampoo = 1
+									no$mc_inventory['shampoo'] =  1
 									dynamic $showerdin
 									'You take a quick shower and dress yourself and Michael, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 									if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'event2':
 									act'Wait For Vika':
 										cls
 										nanny_vika = 1
-										noShampoo = 1
+										no$mc_inventory['shampoo'] =  1
 										dynamic $showerdin
 										'You take a quick shower and dress yourself and Michael.'
 										if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.<br>'

+ 1 - 1
locations/burger.qsrc

@@ -747,7 +747,7 @@ if $ARGS[0] = 'boss':
 			gs 'stat'
 
 			if BurgerQW['Level'] = 57:
-				kosmetica += 200
+				$mc_inventory['cosmetics'] += 200
 				'You sit on a chair and Anatoly Borisovich smiles at you. "I''m so glad this damn trip is over. I really missed you. Incidentally I do not come empty-handed, here''s a gift." with these words Anatoly Borisovich puts some expensive cosmetics on the table. "And yet, I have to tell you about some facts. I am married and I have kids. So do not even think about marriage, it won''t work. My wife is the daughter of a very influential deputy and currently I am only the manager of this lousy diner. Very soon I''ll get the post of deputy minister of construction, but for now I just need to do my job here. So, don''t start any trouble. I need loyal people, and I want you to be my secretary. Did you get the diploma for the secretary course? "'
 
 				if secrDiplom = 1:

+ 2 - 2
locations/cikl.qsrc

@@ -432,8 +432,8 @@ else
 	isprok_lastday = 0
 end
 
-if Enable_autotampon = 0 and isprok = 1: isprok = 0 & 'You threw away your used tampon.'
-if Enable_autotampon = 0 and isprokp = 1:isprokp = 0 & 'You threw away your used sanitary pad.'
+if Enable_auto$mc_inventory['tampons'] =  0 and isprok = 1: isprok = 0 & 'You threw away your used tampon.'
+if Enable_auto$mc_inventory['tampons'] =  0 and isprokp = 1:isprokp = 0 & 'You threw away your used sanitary pad.'
 
 if preg = 1:
 	pregtime = pregchem / 24

+ 6 - 6
locations/city_apt_building.qsrc

@@ -198,11 +198,11 @@ if $ARGS[0] = 'roof':
 				end
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof/nude.jpg"></center>'
-				if krem = 0:
+				if $mc_inventory['suncream'] =  0:
 					pcs_tan += 1
 					'You strip out of your clothes and lie down to sunbathe.'
-				elseif krem > 0:
-					krem -= 1
+				elseif  $mc_inventory['suncream'] > 0:
+					$mc_inventory['suncream'] -=  1
 					pcs_tan += 3
 					'You strip out of your clothes, put sunblock on your body and lie down on the roof to sunbathe.'
 				end
@@ -220,11 +220,11 @@ if $ARGS[0] = 'roof':
 				pcs_mood += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof/bikini.jpg"></center>'
-				if krem = 0:
+				if $mc_inventory['suncream'] =  0:
 					pcs_tan += 1
 					'You lie down to sunbathe.'
-				elseif krem > 0:
-					krem -= 1
+				elseif  $mc_inventory['suncream'] > 0:
+					$mc_inventory['suncream'] -=  1
 					pcs_tan += 3
 					'You put sunblock on your body and lie down on the roof to sunbathe.'
 				end

+ 1 - 1
locations/city_irinaroom.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = 'first5':
 	'"Could you help me out with my back?" She hands you a loofah, and as you start lathering her body you notice her nipples are erect.'
 	IrinaQW = 10
 	alko += 3
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	pcs_hairbsh = 1
 	pcs_makeup = 1

+ 2 - 2
locations/city_lake.qsrc

@@ -139,11 +139,11 @@ if $ARGS[0] = 'start':
 					pcs_mood += 5
 					'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_swimsuit.jpg"></center>'
 
-					if krem = 0:
+					if $mc_inventory['suncream'] =  0:
 						pcs_tan += 1
 						'You lie on the beach and sunbathe for an hour.'
 					else
-						krem -= 1
+						$mc_inventory['suncream'] -=  1
 						pcs_tan += 3
 						'You apply sunblock to your body before sunbathing for an hour.'
 					end

+ 2 - 2
locations/city_market.qsrc

@@ -39,10 +39,10 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 	*P FUNC ('$stock_item', 10, 'Dishwashing detergent', 400, 'fairy', 'city_market')
 	*P FUNC ('$stock_item', 10, 'Clothing detergent', 400, 'poroshok', 'city_market')
 	*P FUNC ('$stock_item', 8, 'Plates', 450, 'cltarelka', 'city_market')
-	*P FUNC ('$stock_item', 20, 'Cosmetics', 1000, 'kosmetica', 'city_market')
+	*P FUNC ('$stock_item', 20, 'Cosmetics', 1000, '$mc_inventory['cosmetics'] >', 'city_market')
 	*P FUNC ('$stock_item', 25, 'Razors (number of shaves)', 300, 'stanok', 'city_market')
 	*P FUNC ('$stock_item', 10, 'Tampons', 160, 'tampon', 'city_market')
-	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, 'sanpad', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, '$mc_inventory['sanitary_pads']', 'city_market')
 	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'city_market', '', iif(bag > 0, 0, 1), 'You need a purse')
 	'</table></center>'
 	*pl

+ 1 - 1
locations/city_pharmacy.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', $curloc, $ARGS[0])
 	*P func ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', $curloc, $ARGS[0])
 	*P func ('$stock_item', 20, 'Tampons', 200, 'tampon', $curloc, $ARGS[0])
-	*P func ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', $curloc, $ARGS[0])
+	*P func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory['sanitary_pads']', $curloc, $ARGS[0])
 	*P func ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', $curloc, $ARGS[0])
 	*P func ('$single_stock_item', 1, 'Breast pump', 2200, 'breastpump', $curloc, $ARGS[0])
 	*P func ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', $curloc, $ARGS[0])

+ 10 - 10
locations/city_sauna.qsrc

@@ -131,38 +131,38 @@ if $ARGS[0] = 'saunaroom':
 
 		act 'Drink some water (0:05)': gs 'beverage', 'bev_wat'
 
-		if kosmetica = 0:
+		if $mc_inventory['cosmetics'] = 0:
 			act 'Ask for some cosmetics':
 				workDolg += 1200
-				kosmetica += 20
+				$mc_inventory['cosmetics'] += 20
 				gt 'city_sauna', 'saunaroom'
 			end
 		end
-		if shampoo = 0:
+		if $mc_inventory['shampoo'] =  0:
 			act 'Ask for some shampoo':
 				workDolg += 400
-				shampoo += 20
+				$mc_inventory['shampoo'] +=  20
 				gt 'city_sauna', 'saunaroom'
 			end
 		end
-		if stanok = 0:
+		if $mc_inventory['razor'] =  0:
 			act 'Ask for some razors':
 				workDolg += 700
-				stanok += 20
+				$mc_inventory['razor'] +=  20
 				gt 'city_sauna', 'saunaroom'
 			end
 		end
-		if tampon = 0:
+		if $mc_inventory['tampons'] =  0:
 			act 'Ask for some tampons':
 				workDolg += 400
-				tampon += 20
+				$mc_inventory['tampons'] +=  20
 				gt 'city_sauna', 'saunaroom'
 			end
 		end
-		if deodorant = 0:
+		if $mc_inventory['deodorant'] =  0:
 			act 'Ask for some deodorant':
 				workDolg += 200
-				deodorant += 20
+				$mc_inventory['deodorant'] +=  20
 				gt 'city_sauna', 'saunaroom'
 			end
 		end

+ 6 - 6
locations/city_saunawhore.qsrc

@@ -354,26 +354,26 @@ if $ARGS[0] = 'bathroom':
 		'You strip from your clothes and gather up your towel, washcloth and soap before heading to the shower. You thoroughly wash yourself so you''re as clean as possible for potential customers.'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 		if workDolg > 0:
-			if stanok <= 0: stanok = 5
+			if $mc_inventory['razor'] <= 0: $mc_inventory['razor'] =  5
 			dynamic $brit
-		elseif workDolg = 0 and stanok > 0:
+		elseif workDolg = 0 and $mc_inventory['razor'] > 0:
 			dynamic $brit
 		end
 		dynamic $dryOff
 	end
 
-	if workDolg > 0 and stanok > 0:
+	if workDolg > 0 and $mc_inventory['razor'] > 0:
 		*nl
 		'You have a handful of cheap razors you can use, enough for <<stanok>> shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 		dynamic $brit
-	elseif workDolg > 0 and stanok = 0:
+	elseif workDolg > 0 and $mc_inventory['razor'] =  0:
 		*nl
 		'You have <<stanok>> razors left. You should go to your room and ask for more.'
-	elseif workDolg <= 0 and stanok > 0:
+	elseif workDolg <= 0 and $mc_inventory['razor'] > 0:
 		*nl
 		'Your current pack of razors will last for <b><<stanok>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 		dynamic $brit
-	elseif workDolg = 0 and stanok = 0:
+	elseif workDolg = 0 and $mc_inventory['razor'] =  0:
 		*nl
 		'You have <<stanok>> razors left. You should to go to the store and buy more.'
 	end

+ 3 - 3
locations/costuming.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'makeup':
 			minut += 30
 			pcs_hairbsh = 1
 			pcs_makeup = acting['scene_makeup']
-			pcs_lipbalm += 8
+			pcs_$mc_inventory['lipstick'] += 8
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
 			'Now that they''ve got your costume all in order, they sit you down in a chair and begin to do your makeup. They quickly get to work to put on everything that needs to be done including wigs, bruises if your character has them, or any other special makeup effect. Soon enough, you''re TV ready.'
 			*nl
@@ -63,7 +63,7 @@ if $ARGS[0] = 'makeup':
 			minut += 120
 			pcs_hairbsh = 1
 			pcs_makeup = acting['scene_makeup']
-			pcs_lipbalm += 8
+			pcs_$mc_inventory['lipstick'] += 8
 			gs 'costuming','backup_clothes'
 			gs 'clothing', 'strip'
 			gs 'underwear', 'remove'
@@ -100,7 +100,7 @@ if $ARGS[0] = 'makeup':
 			minut += 30
 			pcs_hairbsh = 1
 			pcs_makeup = acting['scene_makeup']
-			pcs_lipbalm += 8
+			pcs_$mc_inventory['lipstick'] += 8
 			costuming['check'] += 1
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
 			'Now that they''ve got your costume all in order, they sit you down in a chair and begin to do your makeup. They quickly get to work to put on everything that needs to be done including wigs, distinguishing features your character has and any other special makeup effect. Soon enough, you''re TV ready.'

+ 25 - 25
locations/din_bad.qsrc

@@ -86,18 +86,18 @@ $d_salf = {
 	'<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 cumloc[13] > 0 or cumloc[11] > 0 or cumloc[16] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 12 & gs ''cum_cleanup'' & cumspclnt = 9 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your face and hands clean</b></a>'
-	if cumloc[14] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 14	& gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your belly clean</b></a>'
-	if cumloc[15] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 16 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your breasts clean</b></a>'
-	if cumloc[0] > 0 or cumloc[1] > 0 or cumloc[3] > 0 or cumloc[4] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 15 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your ass and pussy clean</b></a>'
-	if cumloc[10] > 0 or cumloc[9] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 17 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your arms and legs clean</b></a>'
-	if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 6 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Clean your clothing</b></a>'
-	if pcs_makeup ! 1 and cosmetic_tattoo = 0: '<a href="exec:salfetka -= 1 & pcs_makeup = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Remove your makeup</b></a>'
+	if cumloc[13] > 0 or cumloc[11] > 0 or cumloc[16] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 12 & gs ''cum_cleanup'' & cumspclnt = 9 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your face and hands clean</b></a>'
+	if cumloc[14] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 14	& gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your belly clean</b></a>'
+	if cumloc[15] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 16 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your breasts clean</b></a>'
+	if cumloc[0] > 0 or cumloc[1] > 0 or cumloc[3] > 0 or cumloc[4] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 15 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your ass and pussy clean</b></a>'
+	if cumloc[10] > 0 or cumloc[9] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 17 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Wipe your arms and legs clean</b></a>'
+	if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & cumspclnt = 6 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Clean your clothing</b></a>'
+	if pcs_makeup ! 1 and cosmetic_tattoo = 0: '<a href="exec:$mc_inventory['makeup_wipes'] -= 1 & pcs_makeup = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Remove your makeup</b></a>'
 	'<a href="exec:gs ''stat'' & gs ''din_bad'', ''d_bag''"><br><b>Put tissues away</b></a>'
 	'</td></tr></table></center>'
 }
 		
-$d_mouthwash = {
+$d_$mc_inventory['mouthwash'] =  {
 	*clr & cla
 	'<center><h1>Mouth Wash</h1></center>'
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
@@ -106,7 +106,7 @@ $d_mouthwash = {
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 1
-	mouthwash -= 1
+	$mc_inventory['mouthwash'] -=  1
 	gs 'stat'
 	'Your breath smells minty fresh.'
 	''
@@ -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 salfetka > 0: 'You have <b><<salfetka>></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><<salfetka>></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):
@@ -132,39 +132,39 @@ if $ARGS[0] = 'd_bag':
 	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: 
-		'You have a <a href="exec: cla & gt ''mirror'', ''d_bag_mirror''">compact mirror</a> in your purse'+iif(kosmetitka > 0, ' and some portable makeup.', '.')
-		if lipbalm > 0 and pcs_lipbalm <= 0:
+	if $mc_inventory['travel_mirror'] =  1: 
+		'You have a <a href="exec: cla & gt ''mirror'', ''d_bag_mirror''">compact mirror</a> in your purse'+iif($mc_inventory['travel_makeup']  >0, ' and some portable makeup.', '.')
+		if $mc_inventory['lipstick']  > 0 and pcs_lipbalm <= 0:
 			'You can apply some <a href="exec: cls & gs ''mirror'', ''applyLipbalm'' & act ''Return'':gs ''din_bad'', ''d_bag''">lip balm</a>'			
 		end
-	elseif compact_mirror = 0 and kosmetitka > 0:
+	elseif $mc_inventory['travel_mirror'] =  0 and $mc_inventory['travel_makeup']  >0:
 		'You have some portable makeup in your purse, but you need a compact mirror to apply it.'
 	end
-	if deodorant > 0 and deodorant_on = 0:
+	if $mc_inventory['deodorant'] > 0 and deodorant_on = 0:
 		'There''s <a href="exec:hscrunchw = 0 & gs ''din_bad'', ''p_deodorant''">deodorant</a> in your purse. <b><<deodorant>></b> uses remaining.'
-	elseif deodorant > 0 and deodorant_on = 1:
+	elseif $mc_inventory['deodorant'] > 0 and deodorant_on = 1:
 		'You are already wearing deodorant. <b><<deodorant>></b> uses remaining.'
-	elseif deodorant = 0 and deodorant_on = 0:
+	elseif $mc_inventory['deodorant'] =  0 and deodorant_on = 0:
 		'You are not wearing deodorant. <b><<deodorant>></b> uses remaining.'
-	elseif deodorant = 0 and deodorant_on = 1:
-		'You are already wearing deodorant. <b><<deodorant>></b> uses remaining.'
+	elseif $mc_inventory['deodorant'] =  0 and deodorant_on = 1:
+		'You are already wearing deodorant. <b><<$mc_inventory['deodorant']>></b> uses remaining.'
 	end
 !! Hair options
 	*nl
-	if (compact_mirror = 1 or greben = 1) and pcs_hairbsh = 0: 
+	if ($mc_inventory['travel_mirror'] =  1 or $mc_inventory['comb'] =  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: 
+	elseif ($mc_inventory['travel_mirror'] =  1 or $mc_inventory['comb'] =  1) and pcs_hairbsh = 1: 
 		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
 	end
-	if pcs_hairlng > 80 and hscrunch >= 1 and hbraids = 0:
+	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 = 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 hpingrip >= 1 and hbraids = 0:
+	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 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 hscrunch >= 2 and hbraids = 0:
+	if pcs_hairlng > 80 and pcs_hairlng <= 800 and $mc_inventory['scrunchies'] >= 2 and hbraids = 0:
 		if hscrunchw = 0 and hpingripw = 0: 'You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''din_bad'', ''d_bag''">pigtails</a>.'
 		if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''din_bad'', ''d_bag''">Remove</a> your scrunchies and let your hair flow free again.'
 	end
@@ -1113,7 +1113,7 @@ end
 
 if $ARGS[0] = 'p_deodorant':
 	minut += 1
-	deodorant -= 1
+	$mc_inventory['deodorant'] -=  1
 	gs 'sweat', 'deo'
 	gs 'stat'
 	gs 'din_bad', 'd_bag'

+ 39 - 39
locations/din_van.qsrc

@@ -5,7 +5,7 @@
 !!pubestyle = the style in which you have determined to shave your pubic hair
 !!shave_length = the length that your pubic hair will be shortened to after shaving/trimming
 !!shave_trigger = the length that your pubic hair needs to be to shave/trim it
-!!stanok = razor
+!!$mc_inventory['razor'] =  razor
 !!$brit = shaving dynamic
 
 $showerdin = {
@@ -21,11 +21,11 @@ $showerdin = {
 	pcs_hairbsh = 0
 	pcs_makeup = 1
 	if frost > 0:frost = 0
-	if shampoo < 0: shampoo = 0
+	if shampoo < 0: $mc_inventory['shampoo'] =  0
 	lactation['lactmess'] = 0
 	if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-	if noShampoo = 0:
-		shampoo -= 1
+	if no$mc_inventory['shampoo'] =  0:
+		$mc_inventory['shampoo'] -=  1
 	else
 		killvar 'noShampoo'
 	end
@@ -74,7 +74,7 @@ $shower = {
 		menu_off = 1
 		*clr & cla
 		minut += 15
-		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotelShampoo = 1: noShampoo = 1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotel$mc_inventory['shampoo'] =  1: no$mc_inventory['shampoo'] =  1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
@@ -92,7 +92,7 @@ $shower = {
 			''+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 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 shampoo <= 5:
 			'You are getting low on shampoo, with only <<shampoo>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
@@ -210,7 +210,7 @@ $bath = {
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
-		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotelShampoo = 1: noShampoo = 1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotel$mc_inventory['shampoo'] =  1: no$mc_inventory['shampoo'] =  1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
@@ -233,7 +233,7 @@ $bath = {
 			'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 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 shampoo <= 5:
 			'You are getting low on shampoo, with only <<shampoo>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
@@ -291,11 +291,11 @@ $bath = {
 }
 
 $SkinCare = {
-	if item_moisturizer > 0 and item_moisturizer_time <= totminut:
+	if $mc_inventory['moisturiser']  > 0 and item_moisturizer_time <= totminut:
 		act 'Apply Moisturizer (0:05)':
-			item_moisturizer -= 1
+			$mc_inventory['moisturiser'] -= 1
 			! Moisturiser ware-off timer, so you can only use twice a day. Cleared in cikl so always available in morning
-			item_moisturizer_time = totminut + 10 * 60
+			$mc_inventory['moisturiser'] = totminut + 10 * 60
 			menu_off = 1
 			*clr & cla
 			minut += 5
@@ -310,7 +310,7 @@ $SkinCare = {
 }
 
 $brit = {
-	if shave_menu = 1 and stanok > 1:
+	if shave_menu = 1 and $mc_inventory['razor'] > 1:
 		if pcs_leghair > 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
 			if pcs_leghair > 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
 				if daystart < 10 and $start_type[1] = 'tg':
@@ -387,7 +387,7 @@ $brit = {
 						pcs_leghair = 0
 						pcs_pubes = shave_length
 						pcs_horny += 5
-						stanok -= 2
+						$mc_inventory['razor'] -=  2
 						dynamic $dryOff
 						gs'selfplay','bathtub_dildo_check'
 						gs'selfplay','shower_dildo_check'
@@ -402,7 +402,7 @@ $brit = {
 					minut += 5
 					pcs_leghair = 0
 					pcs_horny += 5
-					stanok -= 1
+					$mc_inventory['razor'] -=  1
 					if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 					*nl
@@ -425,7 +425,7 @@ $brit = {
 		end
 	end
 	
-	if (shave_menu = 2 or shave_menu = 1) and stanok > 0:
+	if (shave_menu = 2 or shave_menu = 1) and $mc_inventory['razor'] > 0:
 		if pubestyle > 0 and pcs_pubes >= shave_trigger:
 			if pubestyle = 1:
 				$shave_act = 'Shave your pussy'
@@ -487,7 +487,7 @@ $brit = {
 					minut += 10
 					pcs_pubes = shave_length
 					pcs_horny += 5
-					stanok -= 1
+					$mc_inventory['razor'] -=  1
 					'<<$shave_txt1>>'
 					*nl
 					'<<$shave_txt2>>'
@@ -499,7 +499,7 @@ $brit = {
 		end
 	end
 	
-	if (shave_menu = 3 or shave_menu = 1) and stanok > 0:
+	if (shave_menu = 3 or shave_menu = 1) and $mc_inventory['razor'] > 0:
 		if pcs_leghair > 3:
 			act 'Shave your legs (0:05)':
 				menu_off = 1
@@ -507,7 +507,7 @@ $brit = {
 				minut += 5
 				pcs_leghair = 0
 				pcs_horny += 5
-				stanok -= 1
+				$mc_inventory['razor'] -=  1
 				if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 				*nl
@@ -528,12 +528,12 @@ $brit = {
 	end
 }
 
-$tampon = {
-	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
+$$mc_inventory['tampons'] =  {
+	if $mc_inventory['sanitary_pads'] > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
 		act 'Use a sanitary pad (0:02)':
 			menu_off = 1
 			*clr & cla
-			sanpad -= 1
+			$mc_inventory['sanitary_pads'] -=  1
 			isprokp = 1
 			minut += 2
 			pcs_mood -= 5
@@ -547,7 +547,7 @@ $tampon = {
 		act 'Use a tampon (0:02)':
 			menu_off = 1
 			*clr & cla
-			tampon -= 1
+			$mc_inventory['tampons'] -=  1
 			isprok = 1
 			minut += 2
 			pcs_mood -= 5
@@ -869,12 +869,12 @@ $basin = {
 		end
 	end
 
-	if deodorant > 0 and deodorant_on = 0:
+	if $mc_inventory['deodorant'] > 0 and deodorant_on = 0:
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			deodorant -= 1
+			$mc_inventory['deodorant'] -=  1
 			gs 'sweat', 'deo'
 			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
@@ -1019,8 +1019,8 @@ $palelady = {
 
 if $ARGS[0] = 'private':
 	menu_off = 0
-	if stanok > 0:'You have enough razors left for <b><<stanok>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
-	if stanok > 0 and stanok <= 2 and razor['warning'] ! daystart:
+	if $mc_inventory['razor'] > 0:'You have enough razors left for <b><<stanok>></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!'
 	end
@@ -1029,27 +1029,27 @@ if $ARGS[0] = 'private':
 	if item_moisturizer > 0: 
 		'You look at your moisturiser and think you have about <<item_moisturizer>> applications left.'
 	end
-	if tampon = 0 and sanpad = 0:
+	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 tampon = 1 and tampon['warning'] ! daystart:
+	elseif $mc_inventory['tampons'] =  1 and tampon['warning'] ! daystart:
 		tampon['warning'] = daystart
 		msg'<font color="red">You only have <b><<tampon>></b> tampon left!</font>'
-	elseif tampon = 1:
+	elseif $mc_inventory['tampons'] =  1:
 		msg'<font color="red">You only have <b><<tampon>></b> tampon left.</font>'
 	elseif tampon > 0:
 		'You have <b><<tampon>></b> tampons.'
 	end
 	
-	if sanpad = 1 and sanpad['warning'] ! daystart:
-		sanpad['warning'] = daystart
-		msg'<font color="red">You only have <b><<sanpad>></b> pad left!</font>'
-	elseif sanpad = 1:
-		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
-	elseif sanpad > 0:
-		'You have <b><<sanpad>></b> pads.'
+	if $mc_inventory['sanitary_pads'] = 1 and $mc_inventory['sanitary_pads']['warning'] ! daystart:
+		$mc_inventory['sanitary_pads']['warning'] = daystart
+		msg'<font color="red">You only have <b><<$mc_inventory['sanitary_pads']>></b> pad left!</font>'
+	elseif $mc_inventory['sanitary_pads'] = 1:
+		'<font color="red">You have only <b><<$mc_inventory['sanitary_pads']>></b> pads left.</font>'
+	elseif $mc_inventory['sanitary_pads'] > 0:
+		'You have <b><<$mc_inventory['sanitary_pads']>></b> pads.'
 	end
 
-	'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
+	'Your deodorant will last you for <b><<deodorant>></b> more '+iif($mc_inventory['deodorant'] =  1, 'application.', 'applications.')
 	
 	if $ARGS[1] = 'hotelroom':
 		dynamic $shower
@@ -1510,7 +1510,7 @@ if $ARGS[0] = 'prvt_pee':
 			end
 	!!If PC is on her period and using pad, then the following options should appear as well as the standard "Finish and wipe" act:
 	!!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
-			if isprokp = 1 and sanpad > 0:
+			if isprokp = 1 and $mc_inventory['sanitary_pads'] > 0:
 				act 'Change pad (0:02)':
 					*clr & cla
 					minut += 2
@@ -1629,7 +1629,7 @@ if $ARGS[0] = 'pblc_pee':
 				end
 			end
 
-			if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and sanpad > 0 and bag = 1:
+			if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and $mc_inventory['sanitary_pads'] > 0 and bag = 1:
 				act 'Change pad (0:02)':
 					*clr & cla
 					minut += 2

+ 4 - 4
locations/etoexhib.qsrc

@@ -1387,7 +1387,7 @@ if $ARGS[0] = 'pos39':
 		act 'Change tampon':
 			cla
 			*clr
-			tampon = tampon - 1
+			$mc_inventory['tampons'] =  tampon - 1
 			isprok = 1
 			minut = minut + 5
 			pcs_mood -= 5
@@ -1659,11 +1659,11 @@ if $ARGS[0] = 'pos53':
 				pcs_mood += 5
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/zagar1.jpg"></center>'
 
-				if krem = 0:
+				if $mc_inventory['suncream'] =  0:
 					pcs_tan += 1
 					'You lay down to sunbathe.'
-				elseif krem > 0:
-					krem -= 1
+				elseif  $mc_inventory['suncream'] > 0:
+					$mc_inventory['suncream'] -=  1
 					pcs_tan += 3
 					'You put the sunblock on your body and lay down on the roof to sunbathe.'
 				end

+ 4 - 4
locations/fit.qsrc

@@ -199,13 +199,13 @@ if $ARGS[0] = 'dressing_room':
 		end
 	end
 	
-	if deodorant > 0 and deodorant_on = 0:
-		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
+	if $mc_inventory['deodorant'] > 0 and deodorant_on = 0:
+		'Your deodorant will last you for <b><<deodorant>></b> more '+iif($mc_inventory['deodorant'] =  1, 'application.', 'applications.')
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			deodorant -= 1
+			$mc_inventory['deodorant'] -=  1
 			gs 'sweat', 'deo'
 			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
@@ -226,7 +226,7 @@ if $ARGS[0] = 'fitgirl':
 		*clr & cla
 		pcs_hairbsh = 0
 		pcs_makeup = 1
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		shovertania += 1
 		gs 'stat'

+ 11 - 11
locations/foto.qsrc

@@ -990,12 +990,12 @@ if $ARGS[0] = 'bathroom':
 	act'Go to the studio floor':gt'foto','studio'
 	act'Go to the showers':gt'foto','showers'
 	act'Go to your makeup station':gt'foto','makeup'
-	if deodorant > 0 and deodorant_on = 0:
+	if $mc_inventory['deodorant'] > 0 and deodorant_on = 0:
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			deodorant -= 1
+			$mc_inventory['deodorant'] -=  1
 			gs 'sweat', 'deo'
 			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
@@ -1123,11 +1123,11 @@ if $ARGS[0] = 'showers':
 	if mesec > 0 and isprok = 0:
 		act'Use a tampon':
 			menu_off = 1
-			modeltampon = rand(1,2)
+			model$mc_inventory['tampons'] =  rand(1,2)
 			cla
 			isprok = 1
 			minut += 2
-			if modeltampon = 1:
+			if model$mc_inventory['tampons'] =  1:
 				'Going to one of the dispensers, you take a tampon from it and tear open the packaging and inserting it into your pussy, carefully tucking the string inside so it won''t be visible from the outside and photographers won''t yell at you.'
 				'Your woman''s issue taken care of, you throw the trash away and finish up.'
 			else
@@ -1137,12 +1137,12 @@ if $ARGS[0] = 'showers':
 			act'Finish up':gt'foto','showers'
 		end
 	end
-	if deodorant > 0 and deodorant_on = 0:
+	if $mc_inventory['deodorant'] > 0 and deodorant_on = 0:
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			deodorant -= 1
+			$mc_inventory['deodorant'] -=  1
 			gs 'sweat', 'deo'
 			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
@@ -1191,7 +1191,7 @@ if $ARGS[0] = 'makeup':
 			minut += 30
 			pcs_hairbsh = 1
 			pcs_makeup = 5
-			pcs_lipbalm += 8
+			pcs_$mc_inventory['lipstick'] += 8
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/makeup.jpg"></center>'
 			'You ask for the makeup artists and they sit you down at your station to do their job.'
 			'Perfectly precise and with deft hands, they work carefully, covering up any and all of your imperfections but also coloring your face in ways that flawlessly compliment the natural hues of your body, eyes, face, and hair. The process takes ages, but you know that it''s worth it. This is a level of makeup that you could never achieve on your own.'
@@ -1200,12 +1200,12 @@ if $ARGS[0] = 'makeup':
 			act'Finish':gt'foto','makeup'
 		end
 	end
-	if deodorant > 0 and deodorant_on = 0:
+	if $mc_inventory['deodorant'] > 0 and deodorant_on = 0:
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			deodorant -= 1
+			$mc_inventory['deodorant'] -=  1
 			gs 'sweat', 'deo'
 			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
@@ -1297,7 +1297,7 @@ if $ARGS[0] = 'blackm':
 								act 'No!':
 									cla
 									*clr
-									noShampoo = 1
+									no$mc_inventory['shampoo'] =  1
 									dynamic $showerdin
 									gs 'boyStat', $boy1
 									spafinloc = 3
@@ -1327,7 +1327,7 @@ if $ARGS[0] = 'blackm':
 									act 'Finally':
 										cla
 										*clr
-										noShampoo = 1
+										no$mc_inventory['shampoo'] =  1
 										dynamic $showerdin
 										gs 'boyStat', $boy1
 										gs 'cum_manage'

+ 9 - 9
locations/foto_events.qsrc

@@ -1553,7 +1553,7 @@ if $ARGS[0] = 'topless1.1':
 	*clr & cla
 	pcs_hairbsh = 1
 	pcs_makeup = 5
-	pcs_lipbalm += 8
+	pcs_$mc_inventory['lipstick'] += 8
 	gs 'underwear', 'wear'
 	gs 'stat'
 	gs 'clothing', 'wear_last_worn'
@@ -1688,7 +1688,7 @@ if $ARGS[0] = 'pool1':
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 					pcs_hairbsh = 1
 					pcs_makeup = 5
-					pcs_lipbalm += 8
+					pcs_$mc_inventory['lipstick'] += 8
 					'You go over to your station and touch up your makeup, make sure it''s perfect. You see a few of the other girls who are participating in the shoot doing the same. Soon, everyone is ready and you all pile into a shuttle and drive to the shooting location.'
 					'As promised, as soon as you all arrive, they''re ready to start.'
 					act'Continue':
@@ -1792,7 +1792,7 @@ if $ARGS[0] = 'tennis':
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 					pcs_hairbsh = 1
 					pcs_makeup = 5
-					pcs_lipbalm += 8
+					pcs_$mc_inventory['lipstick'] += 8
 					'You go over to your station and see what they left for you. You see sneakers and a skirt, a visor and a sweat band, and a racket. There is a noticable lack of top or underwear. They didn''t tell you this was going to be a topless shoot, but you guess you shouldn''t be that surprised.'
 					'You pull up the skirt and put on your makeup before heading over to the set.'
 					'You do some practice swings while they''re setting up a high speed camera to capture you in slow motion. Soon enough, they''re ready to begin.'
@@ -1870,7 +1870,7 @@ if $ARGS[0] = 'topless2':
 					minut += 30
 					pcs_hairbsh = 1
 					pcs_makeup = 5
-					pcs_lipbalm += 8
+					pcs_$mc_inventory['lipstick'] += 8
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 					'You head over to your makeup station to get yourself sorted out before getting changed and jumping in the van with the rest of the crew.'
 					'When you get to the set, you strip down and get ready for the shoot.'
@@ -1944,7 +1944,7 @@ if $ARGS[0] = 'beach2':
 					minut += 30
 					pcs_hairbsh = 1
 					pcs_makeup = 5
-					pcs_lipbalm += 8
+					pcs_$mc_inventory['lipstick'] += 8
 					gs 'underwear', 'wear'
 					gs 'stat'
 					gs 'clothing', 'wear_last_worn'
@@ -2023,7 +2023,7 @@ if $ARGS[0] = 'pool2':
 				*clr & cla
 				pcs_hairbsh = 1
 				pcs_makeup = 5
-				pcs_lipbalm += 8
+				pcs_$mc_inventory['lipstick'] += 8
 				minut += 30
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 				'"Yeah sure, why not? Gimme a minute to get ready and I''ll meet you in the car?"'
@@ -2137,7 +2137,7 @@ if $ARGS[0] = 'runway2':
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 						pcs_hairbsh = 1
 						pcs_makeup = 4
-						pcs_lipbalm += 8
+						pcs_$mc_inventory['lipstick'] += 8
 						hour = 19
 						'The runway crew shows up and immediately moves you to the makeup station to get your hair and everything done. They really shovel it on for this. A bit different to the subtle makeup you normally put on for modelling.'
 						'They put you into the clothes that they''ve decided you''re going to be modelling and you wait for the show to begin.'
@@ -2251,7 +2251,7 @@ if $ARGS[0] = 'wet1':
 						minut += 120
 						pcs_hairbsh = 1
 						pcs_makeup = 5
-						pcs_lipbalm += 8
+						pcs_$mc_inventory['lipstick'] += 8
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/wet/wet.mp4"></video></center>'
 						'You put on your makeup and follow him over to the water proof set in the studio and spend the next two hours shrieking and giggling as you get blasted with water while photographed nude.'
 						'He wasn''t kidding! That water is cold!'
@@ -2309,7 +2309,7 @@ if $ARGS[0] = 'wet2':
 			minut += 120
 			pcs_hairbsh = 1
 			pcs_makeup = 5
-			pcs_lipbalm += 8
+			pcs_$mc_inventory['lipstick'] += 8
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/wet/wet.mp4"></video></center>'
 			'You put on your makeup and head over to the water proof set in the studio and spend the next two hours shrieking and giggling as you get blasted with water while photographed nude.'
 			'<i>Is this somehow colder than last time?</i> you wonder, as another icy splash sprays across you.'

+ 1 - 1
locations/foto_events2.qsrc

@@ -77,7 +77,7 @@ end
 if $ARGS[0] = 'champagne1.2':
 	pcs_hairbsh = 1
 	pcs_makeup = 5
-	pcs_lipbalm += 8
+	pcs_$mc_inventory['lipstick'] += 8
 	modelpay = (pcs_mdlng/2 * 10) + min(fame['city_modelling'], 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto['nude']  += 1

+ 10 - 10
locations/gadbana.qsrc

@@ -85,7 +85,7 @@ if mira_guest = 0:
 					menu_off = 1
 					minut += 120
 					pcs_sweat = rand(0,5)
-					noShampoo = 1
+					no$mc_inventory['shampoo'] =  1
 					dynamic $showerdin
 					pcs_hairbsh = 0
 					pcs_makeup = 1
@@ -123,7 +123,7 @@ if mira_guest = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 25
-			if locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home'): noShampoo = 1
+			if locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home'): no$mc_inventory['shampoo'] =  1
 			dynamic $showerdin
 			if frost > 0:frost = 0
 			!!gs 'clothing', 'strip', 'gadbana'
@@ -177,25 +177,25 @@ if mira_guest = 0:
 			end
 		end
 	end
-	if stanok > 0:'Your razor will last <b><<stanok>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
+	if $mc_inventory['razor'] > 0:'Your razor will last <b><<stanok>></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
 	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
 
-	if tampon = 0 and sanpad = 0:
+	if $mc_inventory['tampons'] =  0 and $mc_inventory['sanitary_pads'] = 0:
 		'<b><font color="red">You have no tampons left.</font></b>'
-	elseif tampon = 1:
+	elseif $mc_inventory['tampons'] =  1:
 		'<font color="red">You have only <b><<tampon>></b> tampon left.</font>'
 	else
 		'You have <b><<tampon>></b> tampons.'
 	end
-	if sanpad = 0 and tampon = 0:
+	if $mc_inventory['sanitary_pads'] = 0 and $mc_inventory['tampons'] =  0:
 		'<b><font color="red">You have no pads left.</font></b>'
-	elseif sanpad = 1:
-		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
+	elseif $mc_inventory['sanitary_pads'] = 1:
+		'<font color="red">You have only <b><<$mc_inventory['sanitary_pads']>></b> pads left.</font>'
 	else
-		'You have <b><<sanpad>></b> pads.'
+		'You have <b><<$mc_inventory['sanitary_pads']>></b> pads.'
 	end
 
 	if bcream_have > 0:
@@ -312,7 +312,7 @@ else
 			gs 'stat'
 			act 'Steam':
 				cls
-				noShampoo = 1
+				no$mc_inventory['shampoo'] =  1
 				dynamic $showerdin
 				pcs_hairbsh = 0
 				pcs_makeup = 1

+ 3 - 3
locations/gadprostitutes.qsrc

@@ -320,15 +320,15 @@ if $ARGS[0] = 'work_alone':
 		act 'Look for a client (0:30 and <font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 
-	if salfetka > 0 and (prostitute['cum_dressed'] = 1 or prostitute['cum_undressed'] = 1 or prostitute['cum_vaginal_mod'] = 1 or prostitute['cum_anal_mod'] = 1):
+	if $mc_inventory['makeup_wipes'] > 0 and (prostitute['cum_dressed'] = 1 or prostitute['cum_undressed'] = 1 or prostitute['cum_vaginal_mod'] = 1 or prostitute['cum_anal_mod'] = 1):
 		act 'Remove the cum from your body (0:02)':
 			minut += 2
-			salfetka -= 1
+			$mc_inventory['makeup_wipes'] -= 1
 			cumspclnt = 20
 			gs 'cum_cleanup'
 			gt 'gadprostitutes', 'work'
 		end
-	elseif salfetka = 0:
+	elseif $mc_inventory['makeup_wipes'] =  0:
 		'<br>You don''t have any tissues with you to remove cum from your body.'
 	end
 

+ 6 - 6
locations/gadriver.qsrc

@@ -411,10 +411,10 @@ if $ARGS[0] = 'gadbitch':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadrivernude.jpg"></center>'
 							'You lie down on your towel and start sunbathing.'
 						end
-						if krem = 0:
+						if $mc_inventory['suncream'] =  0:
 							pcs_tan += 1
-						elseif krem > 0:
-							krem -= 1
+						elseif  $mc_inventory['suncream'] > 0:
+							$mc_inventory['suncream'] -=  1
 							'You smear the suntan lotion all over your body to help prevent sunburn.'
 							pcs_tan += 3
 						end
@@ -457,10 +457,10 @@ if $ARGS[0] = 'gadbitch':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadrivergirl.jpg"></center>'
 							'You sunbathe alone on the riverbank.'
 						end
-						if krem = 0:
+						if $mc_inventory['suncream'] =  0:
 							pcs_tan += 1
-						elseif krem > 0:
-							krem -= 1
+						elseif  $mc_inventory['suncream'] > 0:
+							$mc_inventory['suncream'] -=  1
 							pcs_tan += 3
 							'You smear suntan lotion all over your body to prevent sunburn. Then, you''re all lathered up and sunbathing a few minutes later.'
 						end

+ 3 - 3
locations/gas_station_gp_117.qsrc

@@ -428,15 +428,15 @@ if $ARGS[0] = 'work':
 		act 'Look for a client (0:30 and <font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 
-	if salfetka > 0 and (prostitute['cum_dressed'] = 1 or prostitute['cum_undressed'] = 1 or prostitute['cum_vaginal_mod'] = 1 or prostitute['cum_anal_mod'] = 1):
+	if $mc_inventory['makeup_wipes'] > 0 and (prostitute['cum_dressed'] = 1 or prostitute['cum_undressed'] = 1 or prostitute['cum_vaginal_mod'] = 1 or prostitute['cum_anal_mod'] = 1):
 		act 'Remove the cum from your body (0:02)':
 			minut += 2
-			salfetka -= 1
+			$mc_inventory['makeup_wipes'] -= 1
 			cumspclnt = 20
 			gs 'cum_cleanup'
 			gt 'gas_station_gp_117', 'work'
 		end
-	elseif salfetka = 0:
+	elseif $mc_inventory['makeup_wipes'] =  0:
 		'<br>You don''t have any tissues with you to remove cum from your body.'
 	end
 

+ 4 - 4
locations/gdksport.qsrc

@@ -165,13 +165,13 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if deodorant > 0 and deodorant_on = 0:
-		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
+	if $mc_inventory['deodorant'] > 0 and deodorant_on = 0:
+		'Your deodorant will last you for <b><<deodorant>></b> more '+iif($mc_inventory['deodorant'] =  1, 'application.', 'applications.')
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			deodorant -= 1
+			$mc_inventory['deodorant'] -=  1
 			gs 'sweat', 'deo'
 			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
@@ -580,7 +580,7 @@ if $ARGS[0] = 'shower':
 	menu_off = 1
 	*clr & cla
 	$location_type = 'bathroom'
-	if mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): noShampoo = 1
+	if mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

+ 4 - 4
locations/gschool_boys_bathroom.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'boy2_sub':
 				'When he''s finished cleaning up and his uniform is back in place, he heads for the door, but pauses on his way out. "I look forward to next time, but maybe do some exercises to tighten up that pussy, " he says as he walks out the door, leaving you standing there with his cum leaking out of you.'
 				*nl
 				'Luckily for you, no one else enters the bathroom while you clean yourself and get dressed. You leave the bathroom just before the bell rings, hoping no one spots you. You can''t help but wonder if Radomir was serious about those exercises...'
-				noShampoo = 1
+				no$mc_inventory['shampoo'] =  1
 				dynamic $showerdin
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
@@ -396,7 +396,7 @@ if $ARGS[0] = 'boy3_kiss':
 				$orgasm_or = 'yes'
 				gs 'arousal', 'clit_finger', 5
 				gs 'arousal', 'end'
-				noShampoo = 1
+				no$mc_inventory['shampoo'] =  1
 				dynamic $showerdin
 				gs 'stat'
 				'His dick barely exits your ass before the first jet of cum lands on your inner thigh, another lands on your pubic area and a third hits your wet cunt and fingers. He looks at you and smiles, giving you a quick kiss while he helps you down from the sink. "That was amazing," he comments and you''re inclined to agree.'
@@ -678,7 +678,7 @@ if $ARGS[0] = 'boy5':
 						gs 'cum_call', 'mouth', $boy
 						gs 'boyStat', 'A3'
 						gs 'cum_call', 'anus', $boy
-						noShampoo = 1
+						no$mc_inventory['shampoo'] =  1
 						dynamic $showerdin
 						gs 'stat'
 						'Shortly after this, Fedor tenses up and holds your head still, his dick buried deep in your mouth. He shoots his cum deep inside, most of it hitting the back of your throat and getting swallowed instantly, and pumps his manhood even deeper into your mouth a few more times before pulling out and standing up to watch Ivan, who''s still pounding your ass. A few seconds later, Ivan groans loudly and buries his dick deep in your ass. You feel a warmth flood inside you as he starts cumming. When his dick leaves your ass, which gapes after his enthusiastic fuck, you feel some of the cum running out. Ivan stands up and smiles. "Fuck, that was great. You''re the best <<$pcs_nickname>>."'
@@ -917,7 +917,7 @@ if $ARGS[0] = 'boy6_sub':
 						act 'Clean up':
 							*clr & cla
 							*nl
-							noShampoo = 1
+							no$mc_inventory['shampoo'] =  1
 							dynamic $showerdin
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/gangaftermath.jpg"></center>'

+ 2 - 2
locations/gschool_girls_bathroom.qsrc

@@ -96,7 +96,7 @@ if $ARGS[0] = 'bathroom3':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
 			'You soon hear the bell ringing and, feeling much better, decide to make yourself a little more presentable.'
 			'You dry your hair with the hand dryer and give it a brush '+iif (pcs_makeup = 0, 'before wiping away your ruined makeup.','.')+''
-			if kosmetica > 0:
+			if $mc_inventory['cosmetics'] > 0:
 				pcs_makeup = 2
 				'You quickly apply some light make up to replace what was ruined.'
 			else
@@ -122,7 +122,7 @@ if $ARGS[0] = 'bathroom3':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
 				'You soon hear the bell ringing and, feeling much better, decide to make yourself a little more presentable.'
 				'You dry your hair with the hand dryer and give it a brush '+iif (pcs_makeup = 0, 'before wiping away your ruined makeup.','.')+''
-				if kosmetica > 0:
+				if $mc_inventory['cosmetics'] > 0:
 					pcs_makeup = 2
 					'You quickly apply some light make up to replace what was ruined.'
 				else

+ 4 - 4
locations/gschool_lessons4.qsrc

@@ -1126,7 +1126,7 @@ if $ARGS[0] = 'shower2':
 	*clr & cla
 	menu_off = 1
 	!!to offset the use of shampoo in $showerdin
-	shampoo += 1
+	$mc_inventory['shampoo'] +=  1
 	dynamic $showerdin
 	gs 'stat'
 	: gymshower_loop
@@ -1955,13 +1955,13 @@ if $ARGS[0] = 'post_dress':
 	end
 	act 'Use the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
-	if deodorant > 0 and deodorant_on = 0:
-		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
+	if $mc_inventory['deodorant'] > 0 and deodorant_on = 0:
+		'Your deodorant will last you for <b><<deodorant>></b> more '+iif($mc_inventory['deodorant'] =  1, 'application.', 'applications.')
 		act 'Apply deodorant (0:01)':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			deodorant -= 1
+			$mc_inventory['deodorant'] -=  1
 			gs 'sweat', 'deo'
 			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'

+ 4 - 4
locations/gschool_sex.qsrc

@@ -745,7 +745,7 @@ if $ARGS[0] = 'storagesex':
 										minut += 10
 										pcs_mood += 10
 										shower_shave = 0
-										noShampoo = 0
+										no$mc_inventory['shampoo'] =  0
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 										'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers, where you enjoy the sensation of the hot water on your skin as the steam filling the room gives it an almost sauna-like feel, making you feel very relaxed.'
 										dynamic $showerdin
@@ -802,7 +802,7 @@ if $ARGS[0] = 'storagesex':
 								minut += 10
 								pcs_mood += 10
 								shower_shave = 0
-								noShampoo = 0
+								no$mc_inventory['shampoo'] =  0
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 								'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers, where you enjoy the sensation of the hot water on your skin as the steam filling the room gives it an almost sauna-like feel, making you feel very relaxed.'
 								dynamic $showerdin
@@ -849,7 +849,7 @@ if $ARGS[0] = 'storagesex_anal':
 			minut += 10
 			pcs_mood += 10
 			shower_shave = 0
-			noShampoo = 0
+			no$mc_inventory['shampoo'] =  0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 			'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin. The steam filling the room gives it an almost sauna-like feel and makes you feel very relaxed.'
 			dynamic $showerdin
@@ -994,7 +994,7 @@ if $ARGS[0] = 'vd_lockerroom':
 					'Vitek laughs at the comment. "No shit! You''re such a dirty little whore!"'
 					'Vitek walks away as Dan reaches over and turns the shower back on. "You better take a shower, you nasty slut!"' 
 					'You can hear the two of them walking out, talking and laughing as they do. The water runs over you, slowly washing their cum away. You get up and clean up, then walk into the locker room to dry off and get dressed.'
-					noShampoo = 1
+					no$mc_inventory['shampoo'] =  1
 					dynamic $showerdin
 					gs 'arousal', 'hj', 3
 					gs 'arousal', 'hj', 3

+ 2 - 2
locations/hairsalon.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 		act 'Buy Scrunchies - 100 <b>₽</b>':
 			cla & *clr
 			money -= 100
-			hscrunch += 10
+			$mc_inventory['scrunchies'] +=  10
 			gs 'stat'
 			'"Only scrunchies today please!" you tell the cashier.'
 			'"That''ll be 100 ₽!" the receptionist replies back.'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'start':
 		act 'Buy Hair accessories - 120 <b>₽</b>':
 			cla & *clr
 			money -= 120
-			hpingrip += 10
+			$mc_inventory['kirbygrips'] +=  10
 			gs 'stat'
 			'"Only hair pins today please!" you tell the cashier.'
 			'"That''ll be 120 ₽!" the receptionist replies back.'

+ 5 - 5
locations/hookup_after.qsrc

@@ -996,8 +996,8 @@ if $ARGS[0] = 'pre':
 						elseif cum_loc['face'] > 0 or $hookup['cum_choice'] = 'face':
 							'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
 							$npc_apt_bedroom[$boy]
-							if salfetka > 0:
-								salfetka -= 1
+							if $mc_inventory['makeup_wipes'] > 0:
+								$mc_inventory['makeup_wipes'] -= 1
 							else
 								hookup['wipes'] = 2
 							end
@@ -1128,7 +1128,7 @@ if $ARGS[0] = 'pre':
 						'"Do you at least have something for this???" you ask, gesturing at the cum spattered across your skin.'
 					end
 					'"Nah," he says lethargially.'
-					if salfetka > 0:
+					if $mc_inventory['makeup_wipes'] > 0:
 						'<i>Wow... Real class act this one... Great choice on this one <<$pcs_nickname>>,</i> you think to yourself as you pull your own wipes from your purse.'
 						act'Get cleaned up and go':
 							cla & *clr
@@ -1284,10 +1284,10 @@ if $ARGS[0] = 'pre':
 			end
 		end
 		if $stat_cum_msg ! '':
-			if salfetka > 0:
+			if $mc_inventory['makeup_wipes'] > 0:
 				act'Clean yourself up (use your own wipes)':
 					hookup['wipes'] = 1
-					salfetka -= 1
+					$mc_inventory['makeup_wipes'] -= 1
 					gt 'hookup_after', 'wipes'
 				end
 			end

+ 1 - 1
locations/hookup_morning.qsrc

@@ -914,7 +914,7 @@ if $ARGS[0] = 'shower':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		minut += 10
-		shampoo += 1
+		$mc_inventory['shampoo'] +=  1
 		'You twist the faucet and hot water comes rushing out, sighing in pleasure as it pours over your skin. <i>That feels so nice...</i> After enjoying it for a little while, you borrow <<$npc_firstname[$boy]>>''s shampoo and start scrubbing your hair, washing it out shortly after.'
 		dynamic $showerdin
 		*nl

+ 1 - 1
locations/hookup_sex.qsrc

@@ -815,7 +815,7 @@ if $ARGS[0] = 'cum_jerkoff':
 		end
 	end
 	'You grin at him as he cums all over your hand, continuing to jerk him until his cock stops twitching and nothing else comes out. After a couple more tugs for good measure, you pull back.'
-	if salfetka > 0:
+	if $mc_inventory['makeup_wipes'] > 0:
 		act'Get some wipes from your bag':
 			gs 'cum_cleanup', 'cleanloc', 13
 			gs'stat'

+ 1 - 1
locations/husbSex.qsrc

@@ -144,7 +144,7 @@ end
 if $ARGS[0] = 'dolgend':
 	cla
 	*clr
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	gs'stat'
 

+ 40 - 40
locations/intro_city_select.qsrc

@@ -48,9 +48,9 @@ if $ARGS[0] = 'start':
 	fairy = 10
 	eda = 5
 	poroshok = 5
-	shampoo = 20
-	sanpad = 10
-	tampon = 15
+	$mc_inventory['shampoo'] =  20
+	$mc_inventory['sanitary_pads'] = 10
+	$mc_inventory['tampons'] =  15
 	pcs_energy = 100
 	pcs_hydra = 100
 	pcs_sleep = 100
@@ -356,7 +356,7 @@ if $ARGS[0] = 'nerd':
 	fantasybook = 5
 	grupTipe=3
 	money += 3000
-	shampoo = 20
+	$mc_inventory['shampoo'] =  20
 	if player_avatar = 0:
 		pcs_eyesize = 1
 		pcs_lip = 1
@@ -406,8 +406,8 @@ if $ARGS[0] = 'nerdqueen':
 		gs 'npc_relationship', 'socialgroup_setting', 10, 5, 10, 5, 5, 5
 		npc_rel['A18'] = 1
 !!make sure this coming after the gs code above will still set christina to a 1 relationship if I did this correctly. If not, look for this in other spots and fix it
-		kosmetica = 10
-		stanok = 10
+		$mc_inventory['cosmetics'] = 10
+		$mc_inventory['razor'] =  10
 		if player_avatar = 0:
 			pcs_hairlng = 300
 			pcs_eyesize = 3
@@ -573,10 +573,10 @@ if $ARGS[0] = 'jock':
 !!b cup for ideal bmi
 	pcs_skin = 600
 	pcs_butt = 12
-	kosmetica = 10
-	stanok = 10
-	shampoo = 20
-	tampon = 20
+	$mc_inventory['cosmetics'] = 10
+	$mc_inventory['razor'] =  10
+	$mc_inventory['shampoo'] =  20
+	$mc_inventory['tampons'] =  20
 	pcs_run = 20
 	pcs_bushcraft = 5
 	pcs_ftbll = 10
@@ -597,7 +597,7 @@ if $ARGS[0] = 'jock':
 	gs 'npc_relationship', 'socialgroup_setting', 15, 30, -5, 0, -10, 0
 	npc_rel['A129'] -= 10
 	npc_rel['A18'] = 1
-	hscrunch = 10
+	$mc_inventory['scrunchies'] =  10
 	hscrunchw = 0
 	pcs_tan = 20
 	if player_avatar = 0:
@@ -792,10 +792,10 @@ if $ARGS[0] = 'cool':
 	pcs_persuas = 30
 	pcs_inhib = 20
 	swim_start = 99
-	kosmetica = 20
-	shampoo = 20
-	stanok = 20
-	tampon = 20
+	$mc_inventory['cosmetics'] = 20
+	$mc_inventory['shampoo'] =  20
+	$mc_inventory['razor'] =  20
+	$mc_inventory['tampons'] =  20
 	money += 1000
 	gs 'npc_relationship', 'socialgroup_setting', 30, 20, 0, -10, -20, 10
 	npc_rel['A129'] -= 20
@@ -884,17 +884,17 @@ if $ARGS[0] = 'beautiful':
 		genbsize = 22
 !!d cup for ideal bmi
 		pcs_inhib = 25
-		kosmetica = 50
-		falselashesplain = 10
-		falselashesmink = 2
+		$mc_inventory['cosmetics'] = 50
+		$mc_inventory['eyelash_fake'] =  10
+		$mc_inventory['eyelash_mink'] =  2
 		$currentpursetype = 'fashionista'
 		currentpursenumber = 9
 		fashionista_purses[9] = 1
 		bag = 1
 		gs 'obj_din', 'old'
-		greben = 1
-		kosmetitka = 10
-		krem = 10
+		$mc_inventory['comb'] =  1
+		$mc_inventory['travel_makeup'] =  10
+		$mc_inventory['suncream'] =  10
 		pirsC = 2
 		PirsC2_owned = 1
 		gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 10, 0
@@ -930,9 +930,9 @@ if $ARGS[0] = 'gopnik':
 	pcs_inhib = 25
 	pcs_heels = 10
 	pcs_makupskl = 25
-	kosmetica = 10
-	shampoo = 20
-	stanok = 10
+	$mc_inventory['cosmetics'] = 10
+	$mc_inventory['shampoo'] =  20
+	$mc_inventory['razor'] =  10
 	siga = 20
 	fakepassport = 1
 	pirsC = 1
@@ -940,7 +940,7 @@ if $ARGS[0] = 'gopnik':
 	gs 'npc_relationship', 'socialgroup_setting', -5, 0, -10, 30, -10, -10
 	npc_rel['A129'] -= 30
 	npc_rel['A11'] += 10
-	tampon = 20
+	$mc_inventory['tampons'] =  20
 	pcs_run = 20
 	pcs_humint = 10
 	pcs_tan = 10
@@ -1096,8 +1096,8 @@ if $ARGS[0] = 'alternative':
 		pcs_makupskl = 45
 		pcs_danc = 30
 		pcs_heels = 20
-		falselashesplain = 5
-		kosmetica = 20
+		$mc_inventory['eyelash_fake'] =  5
+		$mc_inventory['cosmetics'] = 20
 		pirsD = 5
 		PirsD5_owned = 1
 		pirsA = 2
@@ -1178,7 +1178,7 @@ if $ARGS[0] = 'outcast':
 	pcs_tan = 0
 	pcs_butt = 4
 	grupTipe=5
-	shampoo = 20
+	$mc_inventory['shampoo'] =  20
 end
 
 if $ARGS[0] = 'friendless':
@@ -1283,7 +1283,7 @@ if $ARGS[0] = 'goodgirl':
 		pcs_makupskl = 10
 		church_moral = 40
 		money += 1000
-		shampoo = 10
+		$mc_inventory['shampoo'] =  10
 		pcs_skin = 500
 		$currentpursetype = 'gm'
 		currentpursenumber = 6
@@ -1344,18 +1344,18 @@ if $ARGS[0] = 'slut':
 		pcs_heels = 50
 		genbsize = 22
 !!d cup for ideal bmi
-		kosmetica = 30
-		falselashesplain = 20
+		$mc_inventory['cosmetics'] = 30
+		$mc_inventory['eyelash_fake'] =  20
 		$currentpursetype = 'cats'
 		currentpursenumber = 10
 		cats_purses[10] = 1
 		bag = 1
 		gs 'obj_din', 'old'
-		greben = 1
-		kosmetitka = 10
-		salfetka = 10
-		stanok = 10
-		shampoo = 20
+		$mc_inventory['comb'] =  1
+		$mc_inventory['travel_makeup'] =  10
+		$mc_inventory['makeup_wipes'] =  10
+		$mc_inventory['razor'] =  10
+		$mc_inventory['shampoo'] =  20
 		pirsC = 2
 		PirsC2_owned = 1
 		motherKnowSpravka = 1
@@ -1453,9 +1453,9 @@ if $ARGS[0] = 'goth':
 			pcs_lashes = 1
         end
 		school_clothing = 1
-        kosmetica = 25
-		stanok = 20
-		tampon = 10
+        $mc_inventory['cosmetics'] = 25
+		$mc_inventory['razor'] =  20
+		$mc_inventory['tampons'] =  10
         $currentpursetype = 'dolls'
 		currentpursenumber = 18
 		dolls_purses[18] = 1
@@ -1489,7 +1489,7 @@ if $ARGS[0] = 'sg_settings':
 	fairy = 0
 	eda = 0
 	poroshok = 0
-	shampoo = 0
+	$mc_inventory['shampoo'] =  0
 
 	hcolmotherremember = pcs_haircol
 	hcolfatherremember = pcs_haircol

+ 3 - 3
locations/intro_customization.qsrc

@@ -179,7 +179,7 @@ if $ARGS[0] = 'modite_cos':
 	'<center><b>Cosmetic items</b></center>'
 	*nl
 	killvar '$table_display'
-	gs 'intro_customization', 'modrel_setup2', 'kosmetica', 'Cosmetics'
+	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'
@@ -187,7 +187,7 @@ if $ARGS[0] = 'modite_cos':
 	'<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>'
-	!act 'Shampoo (<<shampoo>>/100)': gs 'intro_customization','setval3' & shampoo = nstat & gt 'intro_customization','modite_cos'
+	!act 'Shampoo (<<shampoo>>/100)': gs 'intro_customization','setval3' & $mc_inventory['shampoo'] =  nstat & gt 'intro_customization','modite_cos'
 	act 'Return': gt'intro_customization','modite'
 end
 
@@ -207,7 +207,7 @@ if $ARGS[0] = 'modite_pha':
 	gs 'intro_customization', 'modrel_setup2', 'lipbalm', 'Lip balms'
 	gs 'intro_customization', 'modrel_setup2', 'fatdel', 'Weight loss pills'
 	gs 'intro_customization', 'modrel_setup2', 'tampon', 'Tampons'
-	gs 'intro_customization', 'modrel_setup2', 'sanpad', 'Sanitary napkins'
+	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
 	'</table></center>'

+ 45 - 45
locations/intro_sg_select.qsrc

@@ -411,8 +411,8 @@ if $ARGS[0] = 'nerd':
 	fantasybook = 5
 	grupTipe=3
 	money += 3000
-	shampoo = 20
-	sanpad = 40
+	$mc_inventory['shampoo'] =  20
+	$mc_inventory['sanitary_pads'] = 40
 	if player_avatar = 0:
 		pcs_eyesize = 1
 		pcs_lip = 1
@@ -472,8 +472,8 @@ if $ARGS[0] = 'nerdqueen':
 		grupvalue[1] = 300
 		grupvalue[3] = 900
 		grupvalue[6] = 700
-		kosmetica = 10
-		stanok = 10
+		$mc_inventory['cosmetics'] = 10
+		$mc_inventory['razor'] =  10
 		if player_avatar = 0:
 			pcs_hairlng = 300
 			pcs_eyesize = 3
@@ -637,11 +637,11 @@ if $ARGS[0] = 'jock':
 !!b cup for ideal bmi
 	pcs_skin = 600
 	pcs_butt = 12
-	kosmetica = 10
-	stanok = 10
-	shampoo = 20
-	sanpad = 20
-	tampon = 20
+	$mc_inventory['cosmetics'] = 10
+	$mc_inventory['razor'] =  10
+	$mc_inventory['shampoo'] =  20
+	$mc_inventory['sanitary_pads'] = 20
+	$mc_inventory['tampons'] =  20
 	pcs_run = 20
 	pcs_bushcraft = 5
 	pcs_ftbll = 10
@@ -667,7 +667,7 @@ if $ARGS[0] = 'jock':
 	gs 'npc_relationship', 'socialgroup_setting', 10, 25, -5, 0, -10, 0
 	npc_rel['A129'] -= 10
 	npc_rel['A18'] = 1
-	hscrunch = 10
+	$mc_inventory['scrunchies'] =  10
 	hscrunchw = 0
 	pcs_tan = 20
 	if player_avatar = 0:
@@ -863,11 +863,11 @@ if $ARGS[0] = 'cool':
 	pcs_persuas = 30
 	pcs_inhib = 20
 	swim_start = 99
-	kosmetica = 20
-	shampoo = 20
-	stanok = 20
-	sanpad = 20
-	tampon = 20
+	$mc_inventory['cosmetics'] = 20
+	$mc_inventory['shampoo'] =  20
+	$mc_inventory['razor'] =  20
+	$mc_inventory['sanitary_pads'] = 20
+	$mc_inventory['tampons'] =  20
 	money += 1000
 	grupvalue[1] = 800
 	grupvalue[2] = 300
@@ -959,17 +959,17 @@ if $ARGS[0] = 'beautiful':
 		genbsize = 22
 !!d cup for ideal bmi
 		pcs_inhib = 25
-		kosmetica = 50
-		falselashesplain = 10
-		falselashesmink = 2
+		$mc_inventory['cosmetics'] = 50
+		$mc_inventory['eyelash_fake'] =  10
+		$mc_inventory['eyelash_mink'] =  2
 		$currentpursetype = 'fashionista'
 		currentpursenumber = 9
 		fashionista_purses[9] = 1
 		bag = 1
 		gs 'obj_din', 'old'
-		greben = 1
-		kosmetitka = 10
-		krem = 10
+		$mc_inventory['comb'] =  1
+		$mc_inventory['travel_makeup'] =  10
+		$mc_inventory['suncream'] =  10
 		pirsC = 2
 		PirsC2_owned = 1
 		gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 10, 0
@@ -1008,11 +1008,11 @@ if $ARGS[0] = 'gopnik':
 	pcs_inhib = 25
 	pcs_heels = 10
 	pcs_makupskl = 25
-	kosmetica = 10
-	shampoo = 20
-	stanok = 10
-	sanpad = 30
-	tampon = 10
+	$mc_inventory['cosmetics'] = 10
+	$mc_inventory['shampoo'] =  20
+	$mc_inventory['razor'] =  10
+	$mc_inventory['sanitary_pads'] = 30
+	$mc_inventory['tampons'] =  10
 	siga = 20
 	fakepassport = 1
 	pirsC = 1
@@ -1026,7 +1026,7 @@ if $ARGS[0] = 'gopnik':
 	npc_rel['A129'] -= 30
 	npc_rel['A11'] += 10
 	npc_rel['A18'] = 1
-	tampon = 20
+	$mc_inventory['tampons'] =  20
 	pcs_run = 20
 	pcs_humint = 10
 	pcs_tan = 10
@@ -1255,8 +1255,8 @@ if $ARGS[0] = 'alternative':
 		pcs_makupskl = 40
 		pcs_danc = 20
 		pcs_heels = 20
-		falselashesplain = 5
-		kosmetica = 20
+		$mc_inventory['eyelash_fake'] =  5
+		$mc_inventory['cosmetics'] = 20
 		pirsD = 5
 		PirsD5_owned = 1
 		pirsA = 2
@@ -1344,8 +1344,8 @@ if $ARGS[0] = 'outcast':
 	pcs_butt = 4
 	pcs_tan = 0
 	grupTipe=5
-	shampoo = 20
-	sanpad = 40
+	$mc_inventory['shampoo'] =  20
+	$mc_inventory['sanitary_pads'] = 40
 end
 
 if $ARGS[0] = 'friendless':
@@ -1452,7 +1452,7 @@ if $ARGS[0] = 'goodgirl':
 		pcs_makupskl = 10
 		church_moral = 40
 		money += 1000
-		shampoo = 10
+		$mc_inventory['shampoo'] =  10
 		pcs_skin = 500
 		$currentpursetype = 'gm'
 		currentpursenumber = 6
@@ -1519,18 +1519,18 @@ if $ARGS[0] = 'slut':
 		pcs_heels = 50
 		genbsize = 22
 !!d cup for ideal bmi
-		kosmetica = 30
-		falselashesplain = 20
+		$mc_inventory['cosmetics'] = 30
+		$mc_inventory['eyelash_fake'] =  20
 		$currentpursetype = 'cats'
 		currentpursenumber = 10
 		cats_purses[10] = 1
 		bag = 1
 		gs 'obj_din', 'old'
-		greben = 1
-		kosmetitka = 10
-		salfetka = 10
-		stanok = 10
-		shampoo = 20
+		$mc_inventory['comb'] =  1
+		$mc_inventory['travel_makeup'] =  10
+		$mc_inventory['makeup_wipes'] =  10
+		$mc_inventory['razor'] =  10
+		$mc_inventory['shampoo'] =  20
 		pirsC = 2
 		PirsC2_owned = 1
 		motherKnowSpravka = 1
@@ -1552,8 +1552,8 @@ if $ARGS[0] = 'slut':
 		gs 'fame', 'pav', 'sex', 600
 		GspravkaT = 2
 		motherKnowSpravka = 2
-		sanpad = 0
-		tampon = 40
+		$mc_inventory['sanitary_pads'] = 0
+		$mc_inventory['tampons'] =  40
 		Gspassed = 0
 		salo = 70
 		stat['porn'] = 75
@@ -1634,9 +1634,9 @@ if $ARGS[0] = 'goth':
 			pcs_lashes = 1
         end
 		school_clothing = 1
-        kosmetica = 25
-		stanok = 20
-		tampon = 10
+        $mc_inventory['cosmetics'] = 25
+		$mc_inventory['razor'] =  20
+		$mc_inventory['tampons'] =  10
         $currentpursetype = 'dolls'
 		currentpursenumber = 18
 		dolls_purses[18] = 1
@@ -1670,7 +1670,7 @@ if $ARGS[0] = 'sg_settings':
 	fairy = 0
 	eda = 0
 	poroshok = 0
-	shampoo = 0
+	$mc_inventory['shampoo'] =  0
 
 	hcolmotherremember = pcs_haircol
 	hcolfatherremember = pcs_haircol

+ 5 - 5
locations/intro_sg_select_custom.qsrc

@@ -253,15 +253,15 @@ if $ARGS[0] = 'none':
 	fakepassport = 0	
 	fantasybook = 0	
 	glass = 0	
-	hscrunch = 0
-	kosmetica = 0
+	$mc_inventory['scrunchies'] =  0
+	$mc_inventory['cosmetics'] = 0
 	pirsC = 0	
 	PirsC1_owned = 0
-	shampoo = 0	
+	$mc_inventory['shampoo'] =  0	
 	siga = 0	
-	stanok = 0
+	$mc_inventory['razor'] =  0
 	swim_start = 0	
-	tampon = 0
+	$mc_inventory['tampons'] =  0
 	
 	!!apprnc & sex stat reset
 	genbsize = 22

+ 4 - 4
locations/katjaEv.qsrc

@@ -1054,13 +1054,13 @@ if $ARGS[0] = 'discountcosmetics':
 	if money >= tovpay and hour <= 20:
 		act 'Buy the cosmetics (800 <b>₽</b>) and contine window shopping':
 			money -= tovpay
-			kosmetica += 50
+			$mc_inventory['cosmetics'] += 50
 			gt 'katjaEv','kathan14'
 		end
 	elseif money >= tovpay and hour >= 20:
 		act 'It''s too late, buy the cosmetics (800 <b>₽</b>) and, acompany Katja to her home':
 			money -= tovpay
-			kosmetica += 50
+			$mc_inventory['cosmetics'] += 50
 			minut += 5
 			gt 'pav_residential'
 		end
@@ -1113,13 +1113,13 @@ if $ARGS[0] = 'discountlipbalm':
 
 	if money >= tovpay and hour <= 20:
 		act 'Buy the lip balm (100 <b>₽</b>) and contine window shopping':
-			lipbalm += 30
+			$mc_inventory['lipstick'] += 30
 			money -= tovpay
 			gt 'katjaEv','kathan14'
 		end
 	elseif money >= tovpay and hour >= 20:
 		act 'It''s too late, buy the lip balm (100 <b>₽</b>) and, acompany Katja to her home':
-			lipbalm += 30
+			$mc_inventory['lipstick'] += 30
 			money -= tovpay
 			minut += 5
 			gt 'pav_residential'

+ 2 - 2
locations/katja_party.qsrc

@@ -263,9 +263,9 @@ if $ARGS[0] = 'part_dress_check':
 				minut += 10
 				'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'
 				'You go out of Katja''s room and find the shower. There are plenty available, and you make sure to clean yourself thoroughly since Katja seems to have an excellent nose for sweat.' 
-				if deodorant > 0:
+				if $mc_inventory['deodorant'] > 0:
 					act 'Add deodorant and go back to Katja':
-						deodorant -= 1
+						$mc_inventory['deodorant'] -=  1
 						gs 'sweat', 'deo'
 						gt 'katja_party', 'party_look_approval'
 					end

+ 1 - 1
locations/kotovdom.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'vann':
 		pcs_horny += 1
 		pcs_hairbsh = 0
 		pcs_makeup = 1
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 

+ 2 - 2
locations/leonid.qsrc

@@ -25,8 +25,8 @@ if $ARGS[0] = 'firstTime':
 	painkiller = painkiller_bak
 	prezik = prezik_bak
 	vitamin = vitamin_bak
-	kosmetica = kosmetica_bak
-	lipbalm = lipbalm_bak
+	$mc_inventory['cosmetics'] = kosmetica_bak
+	$mc_inventory['lipstick']  = lipbalm_bak
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/office.jpg"></center>'

+ 2 - 2
locations/lesbisubhouse.qsrc

@@ -1402,7 +1402,7 @@ if $ARGS[0] = 'ev1':
 						pcs_horny += RAND(10,20)
 						pcs_hairbsh = 0
 						pcs_makeup = 1
-						noShampoo = 1
+						no$mc_inventory['shampoo'] =  1
 						dynamic $showerdin
 						gs'stat'
 
@@ -1418,7 +1418,7 @@ if $ARGS[0] = 'ev1':
 						pcs_horny += RAND(10,20)
 						pcs_hairbsh = 0
 						pcs_makeup = 1
-						noShampoo = 1
+						no$mc_inventory['shampoo'] =  1
 						dynamic $showerdin
 						gs'stat'
 

+ 6 - 6
locations/mey_home.qsrc

@@ -439,11 +439,11 @@ if $ARGS[0] = 'garden':
 				end
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sunbathe_naked<<rand(0,1)>>.jpg"></center>'
-				if krem = 0:
+				if $mc_inventory['suncream'] =  0:
 					pcs_tan += 1
 					'You strip out of your clothes until you are naked, then lie down next to the pool to sunbathe.'
-				elseif krem > 0:
-					krem -= 1
+				elseif  $mc_inventory['suncream'] > 0:
+					$mc_inventory['suncream'] -=  1
 					pcs_tan += 3
 					'You strip out of your clothes until you are naked, then put sunblock on your body and lie down next to the pool to sunbathe.'
 				end
@@ -461,11 +461,11 @@ if $ARGS[0] = 'garden':
 				pcs_mood += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sunbathe<<rand(0,1)>>.jpg"></center>'
-				if krem = 0:
+				if $mc_inventory['suncream'] =  0:
 					pcs_tan += 1
 					'You lie down to sunbathe.'
-				elseif krem > 0:
-					krem -= 1
+				elseif  $mc_inventory['suncream'] > 0:
+					$mc_inventory['suncream'] -=  1
 					pcs_tan += 3
 					'You put sunblock on your body and lie down next to the pool to sunbathe.'
 				end

+ 1 - 1
locations/mey_tamara_events.qsrc

@@ -282,7 +282,7 @@ if $args[0] = 'learning1':
 				pcs_skin += 40
 				if shorthair = 0: curly = 7
 				pcs_pubes = 0
-				pcs_lipbalm = 1
+				pcs_$mc_inventory['lipstick']  = 1
 				pcs_makeup = 3
 				hour = 19
 				minut = 40

+ 4 - 4
locations/mey_vika_events.qsrc

@@ -965,7 +965,7 @@ if $ARGS[0] = 'beach_event0':
 				*clr & cla
 				minut += 10
 				pcs_mood += 10
-				noShampoo = 1
+				no$mc_inventory['shampoo'] =  1
 				dynamic $showerdin
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach3.jpg"></center>'
@@ -978,7 +978,7 @@ if $ARGS[0] = 'beach_event0':
 				*clr & cla
 				minut += 10
 				pcs_mood += 10
-				noShampoo = 1
+				no$mc_inventory['shampoo'] =  1
 				dynamic $showerdin
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach4.jpg"></center>'
@@ -1517,7 +1517,7 @@ if $ARGS[0] = 'gym0':
 												cla
 												*clr
 												minut += 15
-												noShampoo = 1
+												no$mc_inventory['shampoo'] =  1
 												dynamic $showerdin
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/after_bath0.jpg"></center>'
 												'It takes you about fifteen minutes to take a shower.'
@@ -1713,7 +1713,7 @@ if $ARGS[0] = 'bath_common':
 								act 'Further':
 									*clr & cla
 									pcs_mood += 20
-									noShampoo = 1
+									no$mc_inventory['shampoo'] =  1
 									dynamic $showerdin
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/bath_qw10.jpg"></center>'

+ 79 - 79
locations/mirror.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 		if hscrunch < 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 hscrunch >= 1 and hbraids = 0:
+		if pcs_hairlng > 80 and $mc_inventory['scrunchies'] >= 1 and hbraids = 0:
 			if hscrunchw = 0 and hpingripw = 0:
 				$serv['ponytail']='<a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''"><img src="images/system/icons/action/scrunchy.png"></a>'
 				$serv['ponytail desc']='As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''">ponytail</a>. You have <b><<hscrunch>></b> scrunchies left.'
@@ -45,7 +45,7 @@ if $ARGS[0] = 'start':
 				$serv['ponytail desc']='Remove the <a href="exec:hscrunchw = 0 & gs ''mirror'', ''start''">scrunchie</a> to get rid of the ponytail.'
 			end
 		end
-		if pcs_hairlng > 80 and pcs_hairlng <= 400 and hpingrip >= 1 and hbraids = 0:
+		if pcs_hairlng > 80 and pcs_hairlng <= 400 and $mc_inventory['kirbygrips'] >= 1 and hbraids = 0:
 			if hscrunchw = 0 and hpingripw = 0:
 				$serv['bun']='<a href="exec:hpingripw = 1 & gs ''mirror'', ''start''"><img src="images/system/icons/action/clips_pins_grips.png"></a>'
 				$serv['bun desc']='You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''mirror'', ''start''">updo your hair</a>. You have <b><<hpingrip>></b> hair accessories at your disposal.'
@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 				$serv['bun desc']='Let your hair <a href="exec:hpingripw = 0 & gs ''mirror'', ''start''">flow free</a>.'
 			end
 		end
-		if pcs_hairlng > 80 and pcs_hairlng <= 800 and hscrunch >= 2 and hbraids = 0:
+		if pcs_hairlng > 80 and pcs_hairlng <= 800 and $mc_inventory['scrunchies'] >= 2 and hbraids = 0:
 			if hscrunchw = 0 and hpingripw = 0:
 				$serv['pigtails']='<a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''"><img src="images/system/icons/action/hair_ties.png"></a>'
 				$serv['pigtails desc']='You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''">pigtails</a>.'
@@ -65,7 +65,7 @@ if $ARGS[0] = 'start':
 				$serv['pigtails desc']='<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''">Remove</a> your scrunchies and let your hair flow free again.'
 			end
 		end
-		if canBraidHair = 1 and hscrunch >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
+		if canBraidHair = 1 and $mc_inventory['scrunchies'] >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
 			$serv['braid']='<a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''"><img src="images/system/icons/action/braiding.png"></a>'
 			$serv['braid desc']='You can spend half an hour <a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
 		elseif hbraids > 0:
@@ -75,17 +75,17 @@ if $ARGS[0] = 'start':
 		! ----- actions
 		$serv['back']='<a href="exec: gt ''mirror'',''fin''"><img src="images/system/icons/action/back.png"></a>'
 		! ----- lip balm and false lashes
-		if lipbalm > 0 and pcs_lipbalm <= 0:
+		if$mc_inventory['lipstick']  > 0 and pcs_lipbalm <= 0:
 			$serv['lipbalm']='<a href="exec: cla & gs ''mirror'',''applyLipbalm'' & act ''View results'':gt ''mirror'', ''start''"><img src="images/system/icons/action/lipbalm.png"></a>'
 		end
-		if falselashesplain > 0 and pcs_lashes < 3 and lashextensionstyle <= 0:
+		if $mc_inventory['eyelash_fake'] > 0 and pcs_lashes < 3 and lashextensionstyle <= 0:
 			$serv['falselashes']='<a href="exec: cla & gs ''mirror'',''applyLashesplain'' & act ''View results'':gt ''mirror'', ''start''"><img src="images/system/icons/action/falselashes.png"></a>'
 		end
-		if falselashesmink > 0 and pcs_lashes < 4 and lashextensionstyle <= 0:
+		if $mc_inventory['eyelash_mink'] > 0 and pcs_lashes < 4 and lashextensionstyle <= 0:
 			$serv['minklashes']='<a href="exec: cla & gs ''mirror'',''applyLashesmink'' & act ''View results'':gt ''mirror'', ''start''"><img src="images/system/icons/action/minklashes.png"></a>'
 		end
 		! ----- make up
-		if pcs_makeup = 1 and kosmetica > 0:
+		if pcs_makeup = 1 and $mc_inventory['cosmetics'] > 0:
 		$serv4="
 				*clr & cla
 				'<center><img <<$set_imgh>> src=""images/pc/activities/routine/1.jpg""></center>'
@@ -93,36 +93,36 @@ if $ARGS[0] = 'start':
 				*nl
 				act 'Change your mind': gt 'mirror', 'start'
 
-				if kosmetica > 0:
+				if $mc_inventory['cosmetics'] > 0:
 					act 'Light make-up':
 						*clr & cla
 						minut += 3
 						gs 'exp_gain', 'makupskl', rand(1,3)
-						kosmetica -= 1
+						$mc_inventory['cosmetics'] -= 1
 						pcs_makeup = 2
 						'<<$makeupLight>>'
 						act 'Continue': gt 'mirror', 'start'
 					end
 				end
 
-				if kosmetica > 1:
+				if $mc_inventory['cosmetics'] > 1:
 					act 'Vibrant make-up':
 						*clr & cla
 						minut += 5
 						gs 'exp_gain', 'makupskl', rand(1,3)
-						kosmetica -= 2
+						$mc_inventory['cosmetics'] -= 2
 						pcs_makeup = 3
 						'<<$makeupNatural>>'
 						act 'Continue': gt 'mirror', 'start'
 					end
 				end
 
-				if kosmetica > 2:
+				if $mc_inventory['cosmetics'] > 2:
 					act 'Thick make-up':
 						*clr & cla
 						minut += 10
 						gs 'exp_gain', 'makupskl', rand(1,3)
-						kosmetica -= 3
+						$mc_inventory['cosmetics'] -= 3
 						vidageday -= 1
 						pcs_makeup = 4
 						'<<$makeupHeavy>>'
@@ -133,7 +133,7 @@ if $ARGS[0] = 'start':
 						*clr & cla
 						minut += 10
 						gs 'exp_gain', 'makupskl', rand(1,3)
-						kosmetica -= 3
+						$mc_inventory['cosmetics'] -= 3
 						vidageday -= 1
 						pcs_makeup = 6
 						'<<$makeupBimbo>>'
@@ -211,23 +211,23 @@ if $ARGS[0] = 'start':
 		if hpingrip < 1:hpingripw = 0
 		if hscrunch < 2:hpigtail = 0
 
-		if pcs_hairlng > 80 and hscrunch >= 1 and hbraids = 0:
+		if pcs_hairlng > 80 and $mc_inventory['scrunchies'] >= 1 and hbraids = 0:
 			*nl
 			if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
 			if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''mirror'', ''start''">scrunchie</a> to get rid of the ponytail.'
 		end
 
-		if pcs_hairlng > 80 and hpingrip >= 1 and hbraids = 0:
+		if pcs_hairlng > 80 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 ''mirror'', ''start''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
 			if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''mirror'', ''start''">flow free</a>.'
 		end
 
-		if pcs_hairlng > 80 and hscrunch >= 2 and hbraids = 0:
+		if pcs_hairlng > 80 and $mc_inventory['scrunchies'] >= 2 and hbraids = 0:
 			if hscrunchw = 0 and hpingripw = 0: 'You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''">pigtails</a>.'
 			if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''">Remove</a> your scrunchies and let your hair flow free again.'
 		end
 
-		if canBraidHair = 1 and hscrunch >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
+		if canBraidHair = 1 and $mc_inventory['scrunchies'] >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
 			'You can spend half an hour <a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
 		end
 
@@ -236,10 +236,10 @@ if $ARGS[0] = 'start':
 		end
 	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.'
-	if falselashesmink > 0: *pl ' | Mink lashes: <<falselashesmink>>' else *pl ' You have no mink lashes left.'
+	if $mc_inventory['cosmetics'] > 0: *nl 'Cosmetics: <<$mc_inventory['cosmetics'] >>>' else *nl 'You have no makeup.'
+	if $mc_inventory['lipstick'] > 0: *pl ' | Lip gloss: <<lipb$mc_inventory['lipstick'] alm>>' else *pl ' You have no lip gloss left.'
+	if $mc_inventory['eyelash_fake'] > 0: *nl 'False lashes: <<falsel$mc_inventory['eyelash_fake']>>' else *nl 'You have no false lashes left.'
+	if $mc_inventory['eyelash_mink'] > 0: *pl ' | Mink lashes: <<$mc_inventory['eyelash_mink']>>' else *pl ' You have no mink lashes left.'
 	*nl
 	
 	! WD: Cheat Unused ~ 'AutoHapri'
@@ -251,12 +251,12 @@ if $ARGS[0] = 'start':
 	end
 
 	!! WD: Cheat Unused ~ 'AutoMakeup'
-	if pcs_makeup = 1 and kosmetica > 0 and AutoMakeup = 1:
+	if pcs_makeup = 1 and $mc_inventory['cosmetics'] > 0 and AutoMakeup = 1:
 		pcs_makeup = AutoMakeupType
 		gs 'exp_gain', 'makupskl', rand(1,3)
-		if kosmetica < 3 and pcs_makeup = 4:pcs_makeup = 3
-		if kosmetica < 2 and pcs_makeup = 3:pcs_makeup = 2
-		if kosmetica < 1 and pcs_makeup ! 1:
+		if $mc_inventory['cosmetics'] < 3 and pcs_makeup = 4:pcs_makeup = 3
+		if $mc_inventory['cosmetics'] < 2 and pcs_makeup = 3:pcs_makeup = 2
+		if $mc_inventory['cosmetics'] < 1 and pcs_makeup ! 1:
 			pcs_makeup = 1
 			'You have no make-up left.'
 		else
@@ -264,27 +264,27 @@ if $ARGS[0] = 'start':
 				*clr
 				*pl $makeupLight
 				minut -= 3
-				kosmetica -= 1
+				$mc_inventory['cosmetics'] -= 1
 			end
 
 			if pcs_makeup = 3:
 				*pl $makeupNatural
 				minut -= 5
-				kosmetica -= 2
+				$mc_inventory['cosmetics'] -= 2
 			end
 
 			if pcs_makeup = 4:
 				*pl $makeupHeavy
 				minut -= 10
 				vidageday -= 1
-				kosmetica -= 3
+				$mc_inventory['cosmetics'] -= 3
 			end
 
 			if pcs_makeup = 6:
 				*pl $makeupBimbo
 				minut -= 10
 				vidageday -= 1
-				kosmetica -= 3
+				$mc_inventory['cosmetics'] -= 3
 			end
 		end
 	end
@@ -299,7 +299,7 @@ if $ARGS[0] = 'start':
 	! WD: Cheat Unused ~ 'AutoLipBalm'
 
 	!! Added the makeup setting.
-	if pcs_makeup = 1 and kosmetica > 0:
+	if pcs_makeup = 1 and $mc_inventory['cosmetics'] > 0:
 		act 'Apply makeup':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/activities/routine/1.jpg"></center>'
@@ -307,36 +307,36 @@ if $ARGS[0] = 'start':
 			*nl
 			act 'Change your mind': gt 'mirror', 'start'
 
-			if kosmetica > 0:
+			if $mc_inventory['cosmetics'] > 0:
 				act 'Light make-up':
 					*clr & cla
 					minut += 3
 					gs 'exp_gain', 'makupskl', rand(1,3)
-					kosmetica -= 1
+					$mc_inventory['cosmetics'] -= 1
 					pcs_makeup = 2
 					'<<$makeupLight>>'
 					act 'Continue': gt 'mirror', 'start'
 				end
 			end
 
-			if kosmetica > 1:
+			if $mc_inventory['cosmetics'] > 1:
 				act 'Vibrant make-up':
 					*clr & cla
 					minut += 5
 					gs 'exp_gain', 'makupskl', rand(1,3)
-					kosmetica -= 2
+					$mc_inventory['cosmetics'] -= 2
 					pcs_makeup = 3
 					'<<$makeupNatural>>'
 					act 'Continue': gt 'mirror', 'start'
 				end
 			end
 
-			if kosmetica > 2:
+			if $mc_inventory['cosmetics'] > 2:
 				act 'Thick make-up':
 					*clr & cla
 					minut += 10
 					gs 'exp_gain', 'makupskl', rand(1,3)
-					kosmetica -= 3
+					$mc_inventory['cosmetics'] -= 3
 					vidageday -= 1
 					pcs_makeup = 4
 					'<<$makeupHeavy>>'
@@ -344,12 +344,12 @@ if $ARGS[0] = 'start':
 				end
 			end
 
-			if kosmetica > 2:
+			if $mc_inventory['cosmetics'] > 2:
 				act 'Bimbo make-up':
 					*clr & cla
 					minut += 10
 					gs 'exp_gain', 'makupskl', rand(1,3)
-					kosmetica -= 3
+					$mc_inventory['cosmetics'] -= 3
 					vidageday -= 1
 					pcs_makeup = 6
 					'<<$makeupBimbo>>'
@@ -357,12 +357,12 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-	elseif kosmetica <= 0:
+	elseif $mc_inventory['cosmetics'] <= 0:
 		'You don''t have any makeup to apply.'
 	end
 
-	if AutoLipBalm = 1:	gs 'mirror','applyLipbalm'
-	if lipbalm > 0 and pcs_lipbalm <= 0:
+	if Auto$mc_inventory['lipstick']  = 1:	gs 'mirror','applyLipbalm'
+	if $mc_inventory['lipstick']  > 0 and pcs_lipbalm <= 0:
 		act 'Apply lip balm':
 			cla
 			gs 'mirror','applyLipbalm'
@@ -370,7 +370,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if falselashesplain > 0 and pcs_lashes < 3 and lashextensionstyle <= 0:
+	if $mc_inventory['eyelash_fake'] > 0 and pcs_lashes < 3 and lashextensionstyle <= 0:
 		act 'Apply false lashes':
 			cla
 			gs 'mirror','applyLashesplain'
@@ -378,7 +378,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if falselashesmink > 0 and pcs_lashes < 4 and lashextensionstyle <= 0:
+	if $mc_inventory['eyelash_mink'] > 0 and pcs_lashes < 4 and lashextensionstyle <= 0:
 		act 'Apply mink lashes':
 			cla
 			gs 'mirror','applyLashesmink'
@@ -386,7 +386,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-!	if (pcs_makeup <= 1 and kosmetica > 0) or (lipbalm > 0 and pcs_lipbalm <= 0 and pcs_hairbsh = 0):
+!	if (pcs_makeup <= 1 and $mc_inventory['cosmetics'] > 0) or (lipbalm > 0 and pcs_lipbalm <= 0 and pcs_hairbsh = 0):
 !		act 'Do the works': gt 'mirror', 'works'
 !	end
 	act 'Manage your custom make-up routines': dynamic $createcustroutine
@@ -492,10 +492,10 @@ $createcustroutine = {
 	end
 	*nl
 	'Choose if you will use lipbalm'
-	if custlipbalm = 0:
-		'You currently have no lip balm selected: <a href="exec:custlipbalm = 1 & dynamic $createcustroutine">Add Lipbalm to routine</a>'
+	if cust$mc_inventory['lipstick']  = 0:
+		'You currently have no lip balm selected: <a href="exec:cust$mc_inventory['lipstick']  = 1 & dynamic $createcustroutine">Add Lipbalm to routine</a>'
 	else
-		'You currently have lip balm selected: <a href="exec:custlipbalm = 0 & dynamic $createcustroutine">Remove Lipbalm to routine</a>'
+		'You currently have lip balm selected: <a href="exec:cust$mc_inventory['lipstick']  = 0 & dynamic $createcustroutine">Remove Lipbalm to routine</a>'
 	end
 	*nl
 	'Cycle lash options'
@@ -663,9 +663,9 @@ end
 
 if $ARGS[0] = 'works':
 	cla
-	if kosmetica <= 0:
+	if $mc_inventory['cosmetics'] <= 0:
 		'You don''t have any makeup.'
-	elseif pcs_makeup = 1 and (kosmetica >= $ARGS[1]) or ($ARGS[1] = 5 and kosmetica >= 3):
+	elseif pcs_makeup = 1 and ($mc_inventory['cosmetics'] >= $ARGS[1]) or ($ARGS[1] = 5 and $mc_inventory['cosmetics'] >= 3):
 		*nl
 		'You consider for a moment which look you want to go for.'
 		*nl
@@ -673,30 +673,30 @@ if $ARGS[0] = 'works':
 			'You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
 			minut += 3
 			gs 'exp_gain', 'makupskl', rand(1,3)
-			kosmetica -= 1
+			$mc_inventory['cosmetics'] -= 1
 			pcs_makeup = 2
 		elseif $ARGS[1]= 2:
 			'You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
 			minut += 5
 			gs 'exp_gain', 'makupskl', rand(1,3)
-			kosmetica -= 2
+			$mc_inventory['cosmetics'] -= 2
 			pcs_makeup = 3
 		elseif $ARGS[1] = 3:
 			'You apply some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
 			minut += 10
 			gs 'exp_gain', 'makupskl', rand(1,3)
-			kosmetica -= 3
+			$mc_inventory['cosmetics'] -= 3
 			vidageday -= 1
 			pcs_makeup = 4
 		elseif $ARGS[1] = 5:
 			'You apply some bright, seductive makeup, thick enough to cover most imperfections, while drawing attention in a way only a bimbo can.'
 			minut += 10
 			gs 'exp_gain', 'makupskl', rand(1,3)
-			kosmetica -= 3
+			$mc_inventory['cosmetics'] -= 3
 			vidageday -= 1
 			pcs_makeup = 6
 		end
-	elseif kosmetica < $ARGS[1]:
+	elseif $mc_inventory['cosmetics'] < $ARGS[1]:
 		'You don''t have enough makeup to apply your chosen option.'
 	end
 	if pcs_hairbsh < 1:
@@ -705,8 +705,8 @@ if $ARGS[0] = 'works':
 		'You brush your hair.'
 	end
 	if $ARGS[2] = 1:gs 'mirror','applyLipbalm'
-	if $ARGS[3] = 2 and falselashesmink >= 1 and pcs_lashes < 4 and lashextensionstyle <= 0:gs 'mirror','applyLashesmink'
-	if $ARGS[3] = 1 and falselashesplain >= 1 and pcs_lashes < 3 and lashextensionstyle <= 0:gs 'mirror','applyLashesplain'
+	if $ARGS[3] = 2 and $mc_inventory['eyelash_mink'] >= 1 and pcs_lashes < 4 and lashextensionstyle <= 0:gs 'mirror','applyLashesmink'
+	if $ARGS[3] = 1 and $mc_inventory['eyelash_fake'] >= 1 and pcs_lashes < 3 and lashextensionstyle <= 0:gs 'mirror','applyLashesplain'
 	cla
 	act 'View results':gt 'mirror', 'start'
 end &! --- works ----
@@ -714,21 +714,21 @@ end &! --- works ----
 if $ARGS[0] = 'applyLipbalm':
 	if lipbalm > 0 and pcs_lipbalm <= 0:
 		minut += 1
-		lipbalm -= 1
+		$mc_inventory['lipstick'] -= 1
 		lipkoef += rand(0, 1)
 		if lipkoef > 50:
 			lipkoef = 0
 			pcs_lip += 1
 		end
-		pcs_lipbalm += 8
+		pcs_$mc_inventory['lipstick'] += 8
 		'You apply some moisturizing balm on your lips.'
 	end
 end &! --- applyLipbalm ---
 
 if $ARGS[0] = 'applyLashesmink':
-	if falselashesmink > 0 and pcs_lashes < 4:
+	if $mc_inventory['eyelash_mink'] > 0 and pcs_lashes < 4:
 		minut += 15
-		falselashesmink -= 1
+		$mc_inventory['eyelash_mink'] -=  1
 		if false_lashes >= 1 and pcs_lashes = 3:'You remove your old, plain lashes first.'
 		false_lashes = 1
 		pcs_lashes = 4
@@ -737,9 +737,9 @@ if $ARGS[0] = 'applyLashesmink':
 end &! --- applyLashesmink ---
 
 if $ARGS[0] = 'applyLashesplain':
-	if falselashesplain > 0 and pcs_lashes < 3:
+	if $mc_inventory['eyelash_fake'] > 0 and pcs_lashes < 3:
 		minut += 15
-		falselashesplain -= 1
+		$mc_inventory['eyelash_fake'] -=  1
 		false_lashes = 1
 		pcs_lashes = 3
 		'You spend a fair bit of time carefully trimming and affixing your flirtatious false lashes.'
@@ -763,17 +763,17 @@ 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(kosmetitka > 0, '<b><<kosmetitka>></b>', 'no')+' cosmetic applications and '+iif(salfetka > 0, '<b><<salfetka>></b>', 'no')+' tissues left in your purse.'
+	'You have '+iif($mc_inventory['travel_makeup']  >0, '<b><<kosmetitka>></b>', 'no')+' cosmetic applications and '+iif($mc_inventory['makeup_wipes'] > 0, '<b><<salfetka>></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 salfetka > 0 and pcs_makeup ! 1 and cosmetic_tattoo = 0: '<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 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gt ''mirror'', ''d_bag_mirror''"><b>Put on light makeup</b></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>'
+	if $mc_inventory['travel_makeup']  >0 and pcs_makeup = 1:
+		'<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & $mc_inventory['travel_makeup'] -=  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) or (makeupSetting = 4 and kosmetitka >= 3)):
+	elseif $mc_inventory['makeup_wipes'] > 0 and pcs_makeup = 0 and ((makeupSetting = 1 and kosmetitka >= 1) or (makeupSetting = 2 and kosmetitka >= 2) or (makeupSetting = 3 and kosmetitka >= 3) or (makeupSetting = 4 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:
+	elseif ($mc_inventory['travel_makeup'] =  0 or $mc_inventory['makeup_wipes'] =  0) and pcs_makeup = 0:
 		'You need portable makeup and tissues to fix your makeup.'
 	end
 	'</td></tr></table></center>'	
@@ -788,10 +788,10 @@ if $ARGS[0] = 'kosmetitka_apply':
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	gs 'stat'
 
-	if kosmetitka >= 1: '<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', 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 & gs ''exp_gain'', ''makupskl'', 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 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 4 & kosmetitka -= 3 & gt ''mirror'', ''d_bag_mirror''"><b>Heavy make-up</b></a>'
-	if kosmetitka >= 4: '<a href="exec: minut += 10 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 6 & kosmetitka -= 3 & gt ''mirror'', ''d_bag_mirror''"><b>Bimbo make-up</b></a>'
+	if kosmetitka >= 1: '<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & $mc_inventory['travel_makeup'] -=  1 & gt ''mirror'', ''d_bag_mirror''"><b>Light make-up</b></a>'
+	if kosmetitka >= 2: '<a href="exec: minut += 5 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 3 & $mc_inventory['travel_makeup'] -=  2 & gt ''mirror'', ''d_bag_mirror''"><b>Natural make-up</b></a>'
+	if kosmetitka >= 3: '<a href="exec: minut += 10 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 4 & $mc_inventory['travel_makeup'] -=  3 & gt ''mirror'', ''d_bag_mirror''"><b>Heavy make-up</b></a>'
+	if kosmetitka >= 4: '<a href="exec: minut += 10 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 6 & $mc_inventory['travel_makeup'] -=  3 & gt ''mirror'', ''d_bag_mirror''"><b>Bimbo make-up</b></a>'
 	'</td></tr></table></center>'
 	act 'Finish': gt 'mirror', 'd_bag_mirror'
 end
@@ -800,30 +800,30 @@ if $ARGS[0] = 'kosmetitka_fix':
 	*clr & cla
 	'<center><h1>Compact Mirror</h1></center>'	
 	'<center><img <<$set_imgh>> src="/images/pc/items/mirror_compact.jpg"></center>'
-	salfetka -= 1
+	$mc_inventory['makeup_wipes'] -= 1
 	gs 'exp_gain', 'makupskl', rand(1,3)
 	if makeupSetting = 1:
 		minut += 3		
-		kosmetitka -= 1
+		$mc_inventory['travel_makeup'] -=  1
 		pcs_makeup = 2
 		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
 		'<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
+		$mc_inventory['travel_makeup'] -=  2
 		pcs_makeup = 3
 		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
 		'<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
+		$mc_inventory['travel_makeup'] -=  3
 		vidageday -= 1
 		pcs_makeup = 4
 		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
 		'<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>'		
 	elseif makeupSetting = 4:
 		minut += 10
-		kosmetitka -= 3
+		$mc_inventory['travel_makeup'] -=  3
 		vidageday -= 1
 		pcs_makeup = 6
 		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'

+ 3 - 3
locations/mitkasex.qsrc

@@ -249,13 +249,13 @@ if $ARGS[0] = 'gadHandsCum2':
 	'You are lying on the ground. The guys feel the approaching orgasm and put your hands on their members, and you''re told to finish them off. You went to work and were soon rewarded for your diligence, they groaned and you felt your body get showered in hot cum.'
 	gs 'arousal', 'hj', 5, 'sub', 'group'
 	gs 'stat'
-	if kosmetica <= 0:'After the guys went about their business and you are left to clean yourself up.'
-	if kosmetica > 0:
+	if $mc_inventory['cosmetics'] <= 0:'After the guys went about their business and you are left to clean yourself up.'
+	if $mc_inventory['cosmetics'] > 0:
 		act 'Continue':
 			*clr & cla
 			minut += 5
 			body_write = 1
-			kosmetica -= 1
+			$mc_inventory['cosmetics'] -= 1
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkagadsexhandscum2.3.jpg"></center>'
 			'When the guys finished, they painted on your body "fuck slut" and writing a couple of other obscene words, and went about their business. You are left to clean yourself up.'

+ 2 - 2
locations/mother.qsrc

@@ -210,10 +210,10 @@ if $ARGS[0] = '':
 		*nl
 	end
 
-	if npc_rel['A29'] > 65 and mesec > 0 and knowpreg = 0 and tampon = 0 and sanpad = 0:
+	if npc_rel['A29'] > 65 and mesec > 0 and knowpreg = 0 and $mc_inventory['tampons'] =  0 and $mc_inventory['sanitary_pads'] = 0:
 		act 'Ask for a tampon':
 			cla
-			sanpad += 3
+			$mc_inventory['sanitary_pads'] +=  3
 			gs 'npc_relationship', 'modify', 'A29', -15
 			minut += 3
 			'You tell your <<$npc_nickname[''A29'']>> you''re menstruating and ran out of tampons, but really need one right now. She looks at you knowingly, gives you three sanitary pads from her own supply and sternly tells you to next time take care of this in advance.'

+ 2 - 2
locations/movie_studio.qsrc

@@ -210,11 +210,11 @@ if $ARGS[0] = 'showers':
 	if mesec > 0 and isprok = 0:
 		act'Use a tampon':
 			menu_off = 1
-			modeltampon = rand(1,2)
+			model$mc_inventory['tampons'] =  rand(1,2)
 			cla
 			isprok = 1
 			minut += 5
-			if modeltampon = 1:
+			if model$mc_inventory['tampons'] =  1:
 				'Going to one of the dispensers, you take a tampon from it and tear open the packaging and inserting it into your pussy, carefully tucking the string inside so it won''t be visible from the outside and photographers won''t yell at you.'
 				'Your woman''s issue taken care of, you throw the trash away and finish up.'
 			else

+ 1 - 1
locations/natbelapt.qsrc

@@ -516,7 +516,7 @@ if $ARGS[0] = 'bathroom':
 		*clr & cla
 		menu_off = 1
 		minut += 10
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		gs 'stat'
 		

+ 2 - 2
locations/nichBathServant.qsrc

@@ -23,9 +23,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 
 
 	if nichWork = 2:
-		if shampoo = 0: 
+		if $mc_inventory['shampoo'] =  0: 
 			'Since you are allowed to use some of the families shampoo for yourself you open up a new bottle and place it inside your shower.'
-			shampoo = 15
+			$mc_inventory['shampoo'] =  15
 		end
 	
 		act '<b>Go to your bedroom</b>':gt 'nichBedroomServant'

+ 1 - 1
locations/nichTaras.qsrc

@@ -255,7 +255,7 @@ elseif $ARGS[0] = 'katinka':
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/washing1.jpg"></center>'
 		'<<$nichKatinkaNameUC>> takes a bottle of shower gel and covers you in it. Being all tied up there is nothing you can do to prevent it. Her touch feels soft on your skin. Then she uses a hose to clean you. The water is ice cold. She gently dries you with a towel before combing your hair.'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		pcs_hairbsh = 1
 		gs 'stat'

+ 3 - 3
locations/pav_complexb2.qsrc

@@ -170,11 +170,11 @@ if $ARGS[0] = 'roof':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/zagar1.jpg"></center>'
 
-				if krem = 0:
+				if $mc_inventory['suncream'] =  0:
 					pcs_tan += 1
 					'You lie down to sunbathe.'
-				elseif krem > 0:
-					krem -= 1
+				elseif  $mc_inventory['suncream'] > 0:
+					$mc_inventory['suncream'] -=  1
 					pcs_tan += 3
 					'You put the sunblock on your body and lie down on the roof to sunbathe.'
 				end

+ 3 - 3
locations/pav_complexb3.qsrc

@@ -173,11 +173,11 @@ if $ARGS[0] = 'roof':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/zagar1.jpg"></center>'
 
-				if krem = 0:
+				if $mc_inventory['suncream'] =  0:
 					pcs_tan += 1
 					'You lie down to sunbathe.'
-				elseif krem > 0:
-					krem -= 1
+				elseif  $mc_inventory['suncream'] > 0:
+					$mc_inventory['suncream'] -=  1
 					pcs_tan += 3
 					'You put the sunblock on your body and lie down on the roof to sunbathe.'
 				end

+ 2 - 2
locations/pav_disco_sex.qsrc

@@ -696,10 +696,10 @@ if $ARGS[0] = 'handjob_end':
 			end
 		end
 		
-		if salfetka > 0:
+		if $mc_inventory['makeup_wipes'] > 0:
 			act'Wipe your hand off and head in':
 				cla & *clr
-				salfetka -= 1
+				$mc_inventory['makeup_wipes'] -= 1
 				cumspclnt = 9
 				gs'cum_cleanup'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'

+ 2 - 2
locations/pav_hotelReception.qsrc

@@ -1292,7 +1292,7 @@ if $ARGS[0] = 'ffshower':
 						'"I''d love that. My... My clients usually aren''t as gentle with me as you were. I-I liked it. A lot." You say a bit abashed.'
 						'"See you next time then sweetie" She says and walks out of the hotelroom. "And remember to keep this our little secret."'
 						orgasm += 1
-						noShampoo = 1
+						no$mc_inventory['shampoo'] =  1
 						dynamic $showerdin
 						gs 'arousal', 'kiss', 5, 'prostitution'
 						gs 'stat'
@@ -1310,7 +1310,7 @@ if $ARGS[0] = 'ffshower':
 				'"That was pretty incredible. I''ll make sure to ask for you when I''m in town again." She says as she puts her clothes back on.'
 				'"I''d love that. My... My clients usually aren''t as gentle with me as you were. I-I liked it. A lot." You say a bit abashed.'
 				'"See you next time then sweetie" She says and walks out of the hotelroom. "And remember to keep this our little secret."'
-				noShampoo = 1
+				no$mc_inventory['shampoo'] =  1
 				dynamic $showerdin
 				gs 'arousal', 'kiss', 5, 'prostitution'
 				gs 'stat'

+ 2 - 2
locations/pav_lake.qsrc

@@ -346,11 +346,11 @@ if $ARGS[0] = 'sunbathe':
 		inhib_exp += rand(1,3)
 	end
 
-	if krem = 0:
+	if $mc_inventory['suncream'] =  0:
 		'You lie down on your towel and enjoy the warm rays of the sun on your body.'
 		pcs_tan = pcs_tan + 1
 	else
-		krem = krem - 1
+		$mc_inventory['suncream'] -= 1
 		'You apply sunscreen to yourself and lie down on the towel to work on your tan. You enjoy the warm rays of the sun on your body.'
 		pcs_tan = pcs_tan + 3
 	end

+ 4 - 4
locations/pav_lake_nude.qsrc

@@ -205,22 +205,22 @@ if temper >= 15 and month >= 5 and month <= 9:
 				if PCloswimwear = 1:
 					'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_swimsuit.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += 1
-					if krem = 0:
+					if $mc_inventory['suncream'] =  0:
 						pcs_tan += 1
 						'You lie down on your towel and enjoy the warm rays of the sun on your body. You move your straps around to try and prevent tan lines on your back.'
 					else
-						krem -= 1
+						$mc_inventory['suncream'] -=  1
 						pcs_tan += 3
 						'You apply sunscreen to yourself and lie down on the towel to work on your tan. You enjoy the warm rays of the sun on your body. You move your straps around to try and prevent tan lines on your back.'
 					end
 				else
 					'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_nude.jpg"></center>'
 					inhib_exp += rand(1,3)
-					if krem = 0:
+					if $mc_inventory['suncream'] =  0:
 						pcs_tan += 1
 						'You lie down on your towel and enjoy the warm rays of the sun on your naked body.'
 					else
-						krem -= 1
+						$mc_inventory['suncream'] -=  1
 						pcs_tan += 3
 						'You apply sunscreen to yourself and lie down on the towel to work on your tan. You enjoy the warm rays of the sun on your naked body.'
 					end

+ 2 - 2
locations/pav_pharmacy.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'start':
 		*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 20, 'Tampons', 200, 'tampon', 'pav_pharmacy', 'start')
-		*P func ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', 'pav_pharmacy', 'start')
+		*P func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory['sanitary_pads']', 'pav_pharmacy', 'start')
 		*P func ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
 		*P func ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', 'pav_pharmacy', 'start')
@@ -116,7 +116,7 @@ if $ARGS[0] = 'start':
 		*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 20, 'Tampons', 200, 'tampon', 'pav_pharmacy', 'start')
-		*P func ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', 'pav_pharmacy', 'start')
+		*P func ('$stock_item', 20, 'Sanitary napkins', 100, '$mc_inventory['sanitary_pads']', 'pav_pharmacy', 'start')
 		*P func ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
 		*P func ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', 'pav_pharmacy', 'start')

+ 2 - 2
locations/pav_train_market.qsrc

@@ -726,7 +726,7 @@ if ARGS[0] = 7:
 		act 'Buy the cosmetics (800<b>₽</b>)':
 			minut += 15
 			money -= tovpay
-			kosmetica += 50
+			$mc_inventory['cosmetics'] += 50
 			gt 'pav_train_market', 'start'
 		end
 	end
@@ -797,7 +797,7 @@ if ARGS[0] = 10:
 		act 'Buy lip balm (100<b>₽</b>)':
 			*clr & cla
 			minut += 15
-			lipbalm += 30
+			$mc_inventory['lipstick'] += 30
 			money -= tovpay
 			gt 'pav_train_market', 'start'
 		end

+ 1 - 1
locations/placer_sex.qsrc

@@ -14,7 +14,7 @@ if frost > 0: frost = 0
 
 $din_dush  = {
 	*clr & cla
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

+ 4 - 4
locations/pod_ezd.qsrc

@@ -292,11 +292,11 @@ if $ARGS[0] = 'roof':
 				pcs_mood += 5
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/zagar1.jpg"></center>'
 
-				if krem = 0:
+				if $mc_inventory['suncream'] =  0:
 					pcs_tan += 1
 					'You lay down to sunbathe.'
-				elseif krem > 0:
-					krem -= 1
+				elseif  $mc_inventory['suncream'] > 0:
+					$mc_inventory['suncream'] -=  1
 					pcs_tan += 3
 					'You put the sunblock on your body and lay down on the roof to sunbathe.'
 				end
@@ -1692,7 +1692,7 @@ if $ARGS[0] = 'sex_ev1':
 				analplugin = 0
 				'He runs his hand over your butt plug for a second, and then pulls it out while he tells his friend: "Dude, she''s got a plug up her butt! This slut likes it in the ass!"'
 			end
-			if tampon = 1:
+			if $mc_inventory['tampons'] =  1:
 				'He runs his hand over your ass and down to your pussy, feeling the string from the tampon he pulls his hand away. "Fuck man, she''s got a tampon plugging up her twat." You feel yourself blushing. His friend looks over, shrugs and says. "She''s got another hole, use that one." The one standing behind you slaps you hard on the ass. "Hell yeah! You hear that slut? We''re going to fuck you up the ass." He says as he gives your ass another hard slap.'
 				if lubri > 0:
 					lubri -= 1

+ 2 - 2
locations/pod_whore.qsrc

@@ -110,8 +110,8 @@ if $ARGS[0] = 'setup':
 	if pcs_lashes = 2: money_resnic = 50
 	if pcs_lashes > 2: money_resnic = 100
 	!lip balm
-	money_pcs_lipbalm = 0
-	if pcs_lipbalm >= 1: money_pcs_lipbalm = 50
+	money_pcs_$mc_inventory['lipstick']  = 0
+	if pcs_lipbalm >= 1: money_pcs_$mc_inventory['lipstick']  = 50
 	!deep Throat
 	money_throat = 0
 	if pcs_throat >= 20: money_throat = 50

+ 1 - 1
locations/pornstudio.qsrc

@@ -1011,7 +1011,7 @@ if $ARGS[0] = 'medical':
 				pcs_sweat = 0
 				pcs_hairbsh = 1
 				pcs_makeup = 4
-				pcs_lipbalm += 8
+				pcs_$mc_inventory['lipstick'] += 8
 				pcs_breath = 1
 				gs 'stat'
 				'An older woman is waiting for you in the dressing room.'

+ 1 - 1
locations/post_events.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = '1-1':
 		act 'Reassure him he did nothing wrong':
 			*clr & cla
 			minut += 15
-			noShampoo = 1
+			no$mc_inventory['shampoo'] =  1
 			dynamic $showerdin
 			gs 'stat'
 			postmarriedQW = 2

+ 3 - 3
locations/prostitution_pavlovsk.qsrc

@@ -101,15 +101,15 @@ if $ARGS[0] = 'search':
 		end
 	end
 
-	if salfetka > 0 and (prostitute['cum_dressed'] = 1 or prostitute['cum_undressed'] = 1 or prostitute['cum_vaginal_mod'] = 1 or prostitute['cum_anal_mod'] = 1):
+	if $mc_inventory['makeup_wipes'] > 0 and (prostitute['cum_dressed'] = 1 or prostitute['cum_undressed'] = 1 or prostitute['cum_vaginal_mod'] = 1 or prostitute['cum_anal_mod'] = 1):
 		act 'Remove the cum from your body (0:02)':
 			minut += 2
-			salfetka -= 1
+			$mc_inventory['makeup_wipes'] -= 1
 			cumspclnt = 20
 			gs 'cum_cleanup'
 			gt 'prostitution_pavlovsk', 'search'
 		end
-	elseif salfetka = 0:
+	elseif $mc_inventory['makeup_wipes'] =  0:
 		'<br>You don''t have any tissues with you to remove cum from your body.'
 	end
 

+ 3 - 3
locations/road_prostitution.qsrc

@@ -50,15 +50,15 @@ if $ARGS[0] = 'work':
 		act 'Look for a client (0:30 and <font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 
-	if salfetka > 0 and (prostitute['cum_dressed'] = 1 or prostitute['cum_undressed'] = 1 or prostitute['cum_vaginal_mod'] = 1 or prostitute['cum_anal_mod'] = 1):
+	if $mc_inventory['makeup_wipes'] > 0 and (prostitute['cum_dressed'] = 1 or prostitute['cum_undressed'] = 1 or prostitute['cum_vaginal_mod'] = 1 or prostitute['cum_anal_mod'] = 1):
 		act 'Remove the cum from your body (0:02)':
 			minut += 2
-			salfetka -= 1
+			$mc_inventory['makeup_wipes'] -= 1
 			cumspclnt = 20
 			gs 'cum_cleanup'
 			gt 'road_prostitution', 'work'
 		end
-	elseif salfetka = 0:
+	elseif $mc_inventory['makeup_wipes'] =  0:
 		'<br>You don''t have any tissues with you to remove cum from your body.'
 	end
 

+ 7 - 7
locations/rolanbath.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'start':
 	act 'Take a shower (0:15)':
 		*clr & cla
 		minut += 15
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'start':
 								cla
 								*clr
 								minut += 5
-								noShampoo = 1
+								no$mc_inventory['shampoo'] =  1
 								dynamic $showerdin
 								pcs_horny += rand(0,2)
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathhide0.jpg"></center>'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'start':
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
 		pcs_skin += 1
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash4.jpg"></center>'
@@ -341,7 +341,7 @@ if $ARGS[0] = 'start':
 								cla
 								*clr
 								minut += 5
-								noShampoo = 1
+								no$mc_inventory['shampoo'] =  1
 								dynamic $showerdin
 								pcs_horny += rand(0,2)
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathhide0.jpg"></center>'
@@ -524,7 +524,7 @@ if $ARGS[0] = 'pervshower':
 		cla
 		*clr
 		minut += 15
-		noShampoo = 1
+		no$mc_inventory['shampoo'] =  1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
@@ -622,7 +622,7 @@ end
 if $ARGS[0] = 'bonershower':
 	*clr & cla
 	minut += 5
-	noShampoo = 1
+	no$mc_inventory['shampoo'] =  1
 	dynamic $showerdin
 	if frost > 0:frost = 0
 	gs 'stat'
@@ -727,7 +727,7 @@ if $ARGS[0] = 'dryOff':
 				cla
 				*clr
 				minut += 5
-				noShampoo = 1
+				no$mc_inventory['shampoo'] =  1
 				dynamic $showerdin
 				pcs_horny += rand(0,2)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathhide0.jpg"></center>'

+ 25 - 2
locations/saveupdater.qsrc

@@ -1214,7 +1214,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 	if item_moisturizer['time'] > 0:
 		item_moisturizer_time = item_moisturizer['time']
-		gs 'shortgs', 'remove_array_element', 'item_moisturizer', 'time'
+		gs 'shortgs', 'remove_array_element', '<<$mc_inventory['moisturiser']>>', 'time'
 	end
 end
 
@@ -1704,7 +1704,30 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 		killvar '$_fuckbuddies' & killvar 'i_fb'
 	end
 end
-
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00090001:
+	!! ** KEVIN ** Remove gate check on next cycle
+	if migration['beauty'] ! 1:
+		migration['beauty'] = 1
+		$mc_inventory['cosmetics'] = kosmetica
+		$mc_inventory['moisturiser'] = item_moisturizer
+		$mc_inventory['lipstick'] = lipbalm
+		$mc_inventory['eyelash_fake'] = falselashesplain
+		$mc_inventory['eyelash_mink'] = falselashesmink
+		$mc_inventory['razor'] = stanok
+		$mc_inventory['suncream'] = krem
+		$mc_inventory['deodorant'] = deodorant
+		$mc_inventory['tampons'] = tampon
+		$mc_inventory['sanitary_pads'] = sanpad 
+		$mc_inventory['shampoo'] = shampoo
+		$mc_inventory['scrunchies'] = hscrunch
+		$mc_inventory['kirbygrips'] = hpingrip
+		$mc_inventory['makeup_wipes'] = salfetka
+		$mc_inventory['mouthwash'] = mouthwash
+		$mc_inventory['comb'] = greben  
+		$mc_inventory['travel_makeup'] = kosmetitka
+		$mc_inventory['travel_mirror'] = compact_mirror
+	end
+end
 
 gs 'saveg'
 --- saveupdater ---------------------------------

+ 4 - 4
locations/sex_ev_after.qsrc

@@ -1078,7 +1078,7 @@ if $ARGS[0] = 'cum_clean':
 				end
 			end
 			
-			if salfetka > 0:
+			if $mc_inventory['makeup_wipes'] > 0:
 				act'Use your wipes':
 					gs'sex_ev_after', 'wipe_menu'
 					act'Clean everything':
@@ -1391,11 +1391,11 @@ if $ARGS[0] = 'boy_bathroom':
 			act'Take a shower':gs'sex_ev_morning', 'shower'
 		end
 	end
-	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
+	if $mc_inventory['sanitary_pads'] > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
 		act 'Use a sanitary pad (0:02)':
 			menu_off = 1
 			*clr & cla
-			sanpad -= 1
+			$mc_inventory['sanitary_pads'] -=  1
 			isprokp = 1
 			minut += 2
 			pcs_mood -= 5
@@ -1409,7 +1409,7 @@ if $ARGS[0] = 'boy_bathroom':
 		act 'Use a tampon (0:02)':
 			menu_off = 1
 			*clr & cla
-			tampon -= 1
+			$mc_inventory['tampons'] -=  1
 			isprok = 1
 			minut += 2
 			pcs_mood -= 5

Vissa filer visades inte eftersom för många filer har ändrats