Quellcode durchsuchen

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

bgkjdgbizgblzdgbr vor 9 Monaten
Ursprung
Commit
3b1a31c68f
100 geänderte Dateien mit 1168 neuen und 815 gelöschten Zeilen
  1. 2 0
      glife.qproj
  2. 1 1
      locations/BDsex.qsrc
  3. 1 1
      locations/BelSex.qsrc
  4. 32 31
      locations/Cheatmenu_din.qsrc
  5. 2 2
      locations/Cum_Manage.qsrc
  6. 1 1
      locations/FedorEv4_sex.qsrc
  7. 2 2
      locations/HotelRoom.qsrc
  8. 1 1
      locations/JuliaMilHome.qsrc
  9. 3 3
      locations/KatjaHomeTalk.qsrc
  10. 1 1
      locations/LBZhouse.qsrc
  11. 2 2
      locations/LariskaHome.qsrc
  12. 2 2
      locations/Nudelake.qsrc
  13. 28 28
      locations/UnitAppearance.qsrc
  14. 2 2
      locations/VoltrenerSexShower.qsrc
  15. 1 1
      locations/Zvereva_house_events.qsrc
  16. 2 2
      locations/_attributes_danilovich_panties.qsrc
  17. 5 5
      locations/_stock_item_info.qsrc
  18. 22 22
      locations/abduction.qsrc
  19. 1 1
      locations/albina_house_events.qsrc
  20. 2 2
      locations/albina_starlets.qsrc
  21. 1 1
      locations/albina_wine_event.qsrc
  22. 2 2
      locations/arturend.qsrc
  23. 1 1
      locations/backwater.qsrc
  24. 2 2
      locations/barbershop.qsrc
  25. 2 2
      locations/body.qsrc
  26. 6 6
      locations/body_desc.qsrc
  27. 6 6
      locations/booty_call_after.qsrc
  28. 2 2
      locations/booty_call_morning.qsrc
  29. 13 13
      locations/booty_call_shower.qsrc
  30. 3 3
      locations/brothel.qsrc
  31. 24 20
      locations/brother_shower_sex.qsrc
  32. 27 27
      locations/brother_voyeur.qsrc
  33. 1 1
      locations/brother_voyeur_sex.qsrc
  34. 3 3
      locations/buklinik_event.qsrc
  35. 1 1
      locations/burger.qsrc
  36. 3 3
      locations/cikl.qsrc
  37. 6 6
      locations/city_apt_building.qsrc
  38. 1 1
      locations/city_irinaroom.qsrc
  39. 1 1
      locations/city_kafe.qsrc
  40. 2 2
      locations/city_lake.qsrc
  41. 4 4
      locations/city_market.qsrc
  42. 3 3
      locations/city_pharmacy.qsrc
  43. 10 10
      locations/city_residential.qsrc
  44. 10 10
      locations/city_sauna.qsrc
  45. 10 10
      locations/city_saunawhore.qsrc
  46. 11 13
      locations/clothing_QV.qsrc
  47. 28 28
      locations/din_bad.qsrc
  48. 49 49
      locations/din_van.qsrc
  49. 4 4
      locations/etoexhib.qsrc
  50. 5 5
      locations/fit.qsrc
  51. 10 10
      locations/foto.qsrc
  52. 12 12
      locations/gadbana.qsrc
  53. 3 3
      locations/gadprostitutes.qsrc
  54. 6 6
      locations/gadriver.qsrc
  55. 3 3
      locations/gas_station_gp_117.qsrc
  56. 4 4
      locations/gdksport.qsrc
  57. 4 4
      locations/gschool_boys_bathroom.qsrc
  58. 132 133
      locations/gschool_break.qsrc
  59. 2 2
      locations/gschool_girls_bathroom.qsrc
  60. 4 4
      locations/gschool_lessons4.qsrc
  61. 2 2
      locations/gschool_lessonsev1.qsrc
  62. 4 4
      locations/gschool_sex.qsrc
  63. 2 2
      locations/hairsalon.qsrc
  64. 2 40
      locations/home_activity.qsrc
  65. 7 1
      locations/homes_properties.qsrc
  66. 33 1
      locations/homes_properties_attr.qsrc
  67. 5 5
      locations/hookup_after.qsrc
  68. 1 1
      locations/hookup_morning.qsrc
  69. 1 1
      locations/hookup_sex.qsrc
  70. 1 1
      locations/husbSex.qsrc
  71. 40 40
      locations/intro_city_select.qsrc
  72. 3 3
      locations/intro_customization.qsrc
  73. 45 45
      locations/intro_sg_select.qsrc
  74. 5 5
      locations/intro_sg_select_custom.qsrc
  75. 148 0
      locations/item_cart.qsrc
  76. 198 0
      locations/item_stock_db.qsrc
  77. 4 4
      locations/katjaEv.qsrc
  78. 2 2
      locations/katja_party.qsrc
  79. 1 1
      locations/kotovdom.qsrc
  80. 2 2
      locations/leonid.qsrc
  81. 2 2
      locations/lesbisubhouse.qsrc
  82. 6 6
      locations/mey_home.qsrc
  83. 1 1
      locations/mey_tamara_events.qsrc
  84. 4 4
      locations/mey_vika_events.qsrc
  85. 80 78
      locations/mirror.qsrc
  86. 3 3
      locations/mitkasex.qsrc
  87. 2 2
      locations/mother.qsrc
  88. 2 2
      locations/movie_studio.qsrc
  89. 1 1
      locations/natbelapt.qsrc
  90. 2 2
      locations/nichBathServant.qsrc
  91. 1 1
      locations/nichTaras.qsrc
  92. 3 3
      locations/pav_complexb2.qsrc
  93. 3 3
      locations/pav_complexb3.qsrc
  94. 2 2
      locations/pav_disco_sex.qsrc
  95. 2 2
      locations/pav_hotelReception.qsrc
  96. 2 2
      locations/pav_lake.qsrc
  97. 4 4
      locations/pav_lake_nude.qsrc
  98. 5 4
      locations/pav_pharmacy.qsrc
  99. 2 2
      locations/pav_train_market.qsrc
  100. 1 1
      locations/placer_sex.qsrc

+ 2 - 0
glife.qproj

@@ -1242,6 +1242,8 @@
 		<Location name="sexorg"/>
 		<Location name="$stock_item_info"/>
 		<Location name="$stock_item"/>
+		<Location name="item_cart"/>
+		<Location name="item_stock_db"/>
 		<Location name="$single_stock_item"/>
 		<Location name="$buy_item"/>
 		<Location name="$buy_single_item"/>

+ 1 - 1
locations/BDsex.qsrc

@@ -524,7 +524,7 @@ if $ARGS[0] = 'end':
 		pcs_horny += 1
 		pcs_hairbsh = 1
 		pcs_makeup = 1
-		noShampoo = 1
+		mc_inventory['noshampoo'] =  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
+		mc_inventory['noshampoo'] = 1
 		dynamic $showerdin
 		minut += 15
 		gs 'fame', 'pav', 'prostitute', 1

+ 32 - 31
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_tampons =  1:
+		'Automatic cheat on Tampon: <a href="exec:Enable_auto_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_tampons =  1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end
 	*nl
 	if Enable_nodream > 0:
@@ -857,6 +857,7 @@ $cheatmenu['looks'] = {
 	'</td><td width="33%" cellpadding="20" valign="top">'
 	'<<$pcs_vag>>'
 	if pcs_vag > 0:'<a href="exec:pcs_vag = 0 & dynamic $cheatmenu[''looks'']">Reinstate virginity</a>'
+	if stat['think_virgin'] > 0:'<a href="exec:stat[''vaginal''] = 0 & stat[''vaginal_fist''] = 0 & stat[''vaginal_dildo''] = 0 & stat[''vaginal_strap''] = 0 & dynamic $cheatmenu[''looks'']">Make Sveta believe she is a virgin again (resets the related sex stats)</a>'
 	if pcs_vag <= 25:'<a href="exec:gs ''Cheatmenu_din'', ''vagenlarge''">Enlarge comfortable vaginal capacity</a>'
 	if pcs_vag >= 5:'<a href="exec:gs ''Cheatmenu_din'', ''vagreduce''">Reduce comfortable vaginal capacity</a>'
 	'Your comfortable vaginal capacity will reduce by <<vshrink>> every <<vshrinkdays>> days.'
@@ -3268,8 +3269,8 @@ $cheatmenu['items'] = {
 		*pl 'Lubricants: <a href="exec:lubri=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<lubri>> </b></a>'
 		*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 '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>'
 
 		if klisma = 0:
 			*pl 'Enema kit: <a href="exec:klisma = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
@@ -3326,42 +3327,42 @@ $cheatmenu['items'] = {
 
 	'<h4>Cosmetics items</h4>'
 	if showCosmeticsItems = 0:
-		'<a href = "exec: showCosmeticsItems = 1 & dynamic $cheatmenu[''items'']">Show Details </a>'
+		'<a href = "exec:showCosmeticsItems = 1 & dynamic $cheatmenu[''items'']">Show Details </a>'
 	end
 
 	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>'
+		'<a href = "exec:showCosmeticsItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </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> <<mc_inventory[''moisturiser'']>> </b></a>'
+		*pl 'Lip balms: <a href="exec:mc_inventory[''lipbalm'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''lipbalm''] >> </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> <<mc_inventory[''shampoo'']>> </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
+	mc_inventory['noshampoo'] = 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
+	hotelmc_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
+			hotelmc_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
+		mc_inventory['noshampoo'] = 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
+			mc_inventory['noshampoo'] = 1
 			dynamic $showerdin
 			minut += 15
 			pcs_hairbsh = 1
@@ -478,7 +478,7 @@ if $ARGS[0] = 'shower':
 
 		act 'Bathe together':
 			cla & *clr
-			noShampoo = 1
+			mc_inventory['noshampoo'] = 1
 			dynamic $showerdin
 			pcs_hairbsh = 1
 			pcs_makeup = 1
@@ -539,7 +539,7 @@ if $ARGS[0] = 'shower':
 			end
 		end
 	else
-		noShampoo = 1
+		mc_inventory['noshampoo'] = 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
+	mc_inventory['noshampoo'] = 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
+		mc_inventory['noshampoo'] = 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
+			mc_inventory['noshampoo'] = 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

+ 28 - 28
locations/UnitAppearance.qsrc

@@ -143,7 +143,7 @@ if $ARGS[0] = 'GenerateSvetas':
 	unitPShoQuality = PShoQuality
 	$unitpantyworntype = $pantyworntype
 	$unitbraworntype = $braworntype
-	unitpcs_lipbalm = pcs_lipbalm
+	unitpcs_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = 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_lipbalm  = pcs_lipbalm
     unitmopkoef = tunitmopkoef
     unitpcs_hairbsh = tunitpcs_hairbsh
     unitpcs_breath = tunitpcs_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
+						mc_inventory['noshampoo'] = 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
+					mc_inventory['noshampoo'] = 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
+		mc_inventory['noshampoo'] = 1
 		dynamic $showerdin
 		pcs_horny += 10
 		pcs_hairbsh = 1

+ 2 - 2
locations/_attributes_danilovich_panties.qsrc

@@ -30,7 +30,7 @@ elseif ARGS[1] = 4:
 	underwear['pair'] = 4
 
 elseif ARGS[1] = 5:
-	PanType = 3
+	PanType = 2
 	PanFun = 2
 	PanQuality = 3
 	PanThinness = 3
@@ -51,7 +51,7 @@ elseif ARGS[1] = 7:
 	underwear['pair'] = 7
 
 elseif ARGS[1] = 8:
-	PanType = 3
+	PanType = 2
 	PanFun = 2
 	PanQuality = 2
 	PanThinness = 2

+ 5 - 5
locations/_stock_item_info.qsrc

@@ -13,13 +13,13 @@ $item_info['tabletki'] = '<center><b>Birth control pills</b></center><br>Combina
 $item_info['vitamin'] = '<center><b>Vitamin drinks</b></center><br>A complete multivitamin in a fun-to-chew gummy, specially formulated to provide nutritional support for growing teenage girls.<br>Application: one pill a day.'
 $item_info['lekarstvo'] = '<center><b>Antibiotics</b></center><br>Antibiotics specifically treat infections caused by bacteria, such as Staph., Strep., or E. Coli., and either kill the bacteria (bactericidal) or keep it from reproducing and growing (bacteriostatic)<br>Application: one tablet a day.'
 $item_info['mosolmaz'] = '<center><b>Healing Ointment</b></center><br>Protects and soothes cracked and chafed skin. This will cure your itchy vulva'
-$item_info['lipbalm'] = '<center><b>Lip balm</b></center><br>Balm moisturizes lips, leaves them super soft and adds a subtle shimmer that makes your lips more attractive. There is a side effect: irreversible increased lip size when used for a long time.'
+$item_info[mc_inventory['lipbalm']] = '<center><b>Lip balm</b></center><br>Balm moisturizes lips, leaves them super soft and adds a subtle shimmer that makes your lips more attractive. There is a side effect: irreversible increased lip size when used for a long time.'
 $item_info['fatdel'] = '<center><b>Weight loss pill</b></center><br>This magic pill can increase fat burning, and the effect lasts for X days from the date of application. Intensive physical exertion, such as running, significantly increases the effectiveness of this drug.'
 $item_info['klisma'] = '<center><b>Enema kit</b></center><br>A medical tool for cleaning and rinsing the rectum.'
 $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['tampons']] = '<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[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,8 +27,8 @@ $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['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[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[mc_inventory['razor']] = '<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...'
 $item_info['bottle'] = '<center><b>Bottle of water</b></center><br>A cheap and convenient bottle of water that fits into any bag to be carried around with you.'

+ 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['lipbalm']
 	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['lipbalm']  = 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['lipbalm']  = 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
+		mc_inventory['noshampoo'] = 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['lipbalm']  = 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

@@ -310,7 +310,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':
 						*clr & cla
-						noShampoo = 1
+						mc_inventory['noshampoo'] =  1
 						dynamic $showerdin
 						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
@@ -467,7 +467,7 @@ if $ARGS[0] = 'parkrally':
 		gs 'exercise', 'tier2', 0, 'agil', 'danc'
 		profiDanceTime += 1
 		inhib_exp += rand(3,5)
-		noShampoo = 1
+		mc_inventory['noshampoo'] =  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
+			mc_inventory['noshampoo'] = 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_lipbalm  = 'shiny'
 			$pc_descWordy['lip glossed'] = 'gloss-slicked'
 		elseif pcs_lip = 2:
-			$pcs_lipbalm = 'brilliant and juicy'
+			$pcs_lipbalm  = 'brilliant and juicy'
 			$pc_descWordy['lip glossed'] = 'invitingly glossed'
 		elseif pcs_lip = 3:
-			$pcs_lipbalm = 'juicy and full'
+			$pcs_lipbalm  = 'juicy and full'
 			$pc_descWordy['lip glossed'] = 'wetly-glossed'
 		elseif pcs_lip = 4:
-			$pcs_lipbalm = 'wet and glossy'
+			$pcs_lipbalm  = 'wet and glossy'
 			$pc_descWordy['lip glossed'] = 'suggestively gloss-glazed'
 		else
 			!! Lip size 0
-			$pcs_lipbalm = 'shiny'
+			$pcs_lipbalm  = 'shiny'
 			$pc_descWordy['lip glossed'] = 'gloss-slicked'
 		end
 	else
 		!! No gloss
 		$pc_desc['lip gloss'] = 'soft'
-		$pcs_lipbalm = 'soft'
+		$pcs_lipbalm  = '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
+	mc_inventory['noshampoo'] = 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
+	mc_inventory['noshampoo'] = 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
+		mc_inventory['noshampoo'] = 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
+	mc_inventory['noshampoo'] = 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
+	mc_inventory['noshampoo'] = 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
+	mc_inventory['noshampoo'] = 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
+			mc_inventory['noshampoo'] = 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
+			mc_inventory['noshampoo'] = 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
+			mc_inventory['noshampoo'] = 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
+	mc_inventory['noshampoo'] = 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
+		mc_inventory['noshampoo'] = 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
+		mc_inventory['noshampoo'] = 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
+	mc_inventory['noshampoo'] = 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(mc_inventory['lipbalm'] < 1,'<a href="exec: mc_inventory[''lipbalm''] += 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 '+mc_inventory['razor'] +'), 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

+ 24 - 20
locations/brother_shower_sex.qsrc

@@ -284,7 +284,7 @@ if $ARGS[0] = 'brother_shower_fuck_first2':
 					'<i>Damn...</i> You close your eyes, sighing as you feel another glob of Kolka''s cum drip from your pussy. <i>I should go buy a morning after pill from the pharmacy...</i>'
 				end
 			end
-			act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+			act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 		else
 			'Suddenly, you feel your brother tapping you on the shoulder.'
 			act'Continue':gt'brother_shower_sex', 'brother_fuck_cum'
@@ -390,6 +390,7 @@ if $ARGS[0] = 'brother_shower_anal_vagv_analv':
 					gs 'arousal', 'anal', 5
 					act 'Was it good for you?':
 						gs 'arousal', 'end'
+						dynamic $showerdin
 						gs 'stat'
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brotherwash.jpg"></center>'
@@ -467,6 +468,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 						'You''re slightly annoyed by the ''more importantly'' part, but can''t deny that you''ve enjoyed your first butt fucking.'  
 						'"It was..." you say, letting it hang for a moment before finishing with "Good. Will it happen again? I''ll think about it."'
 						gs 'arousal', 'end'
+						dynamic $showerdin
 						gs 'stat'
 						act'Finish':mirror_steam = hour & gt $loc
 					end
@@ -507,6 +509,7 @@ if $ARGS[0] = 'brother_shower_anal_vagv_analnv':
 				*clr
 				cla
 				gs 'arousal', 'end'
+				dynamic $showerdin
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brotherwash.jpg"></center>'
 				'Straightening up, you both go back to washing yourselves in silence before you turn to face him.'  
@@ -540,6 +543,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analnv':
 		act 'Clean up':
 			*clr & cla
 			gs 'arousal', 'end'
+			dynamic $showerdin
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershower.jpg"></center>'
 			'Straightening up, you both go back to washing yourselves in silence before you turn to face him.'  
@@ -572,7 +576,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 			gs 'cum_call', 'stomach', 'A34', 1
 			'<center><video autoplay loop src="images/shared/sex/shower/jerkoff1.mp4"></center>'
 			'"Not inside me!" you cry out. You quickly pull yourself off him and turn around, grabbing his cock with your hand and jerking him furiously until he groans and you feel his hot cum spattering all over your stomach.'
-			act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+			act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 		end
 
 		act'Suck him off':gt'brother_shower_sex', 'shower_swallow'
@@ -600,7 +604,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'"Well how was I supposed to know that?"'
 					end
 				end
-				act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+				act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 			end
 		end
 
@@ -623,7 +627,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				end
 			end
 			if birth_control['think_safe'] = 0:'"Sorry," you smile apologetically. "I''m not on birth control and I can''t afford to get knocked up. Especially not by my little brother."'
-			act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+			act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 		end
 		
 		act'Fuck him till he cums':gt'brother_shower_sex', 'shower_creampie'
@@ -669,7 +673,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'"Well you didn''t tell me about it! How was I supposed to know?!"'
 						'"Fuck!"'
 						'<i>Maybe I can get a morning after pill from the pharmacy,</i> you think to yourself.'
-						act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+						act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 					end
 					
 					act'"I''m not but it''s okay"':
@@ -679,7 +683,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'"What?? But you said-!"'
 						'"I know, I know. I''m sorry Kolka, this is my fault, I should have told you. But now you know I guess?" you smile weakly at him.'
 						'<i>Maybe I can get a morning after pill from the pharmacy,</i> you think to yourself.'
-						act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+						act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 					end
 				else
 					act'"Was just asking"':
@@ -693,7 +697,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 							'"You didn''t feel me come inside you?" he asks, raising an eyebrow?"'
 							'"I did, I just didn''t understand why you were cumming without making me cum first. I thought you were a better lover than that," you respond wryly.'
 						end
-						act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+						act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 					end
 					
 					act'"You still need to ask" (tease)':
@@ -701,7 +705,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'"Well," you chide him, "you still need to ask."'
 						'"How come? It''s not like you''re in any danger are you?"'
 						'"No, but I like telling you to come inside me," you smirk.'
-						act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+						act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 					end
 					
 					act'"You still need to ask"':
@@ -710,7 +714,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'"How come? It''s not like you''re in any danger are you?"'
 						'"No, but you still need to ask. It''s my pussy and it''s my right to choose whether you''re filling it with cum or not."'
 						'"Tch. Whatever."'
-						act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+						act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 					end
 				end
 			else
@@ -722,7 +726,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						cla & *nl
 						'"It''s okay Kolka, I''m on birth control," you reassure him. His expression melts with visible relief. "But still, you need to be more careful. If I forget to take my pills or stop for some reason, you cumming inside me like that could be really dangerous. I could really get pregnant."'
 						'He nods back at you in understanding. "I''m sorry," he says again. "I''ll be more careful in the future."'
-						act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+						act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 					end
 					
 					act'"I''m on birth control so you don''t have to worry"':
@@ -730,7 +734,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 						'"It''s okay Kolka, I''m on birth control," you reassure him. His expression melts with visible relief. "So that means you can come inside me as much as you like and you don''t have to worry."'
 						'You wink at him and his jaw drops open. He looks down at your cum dripping pussy and you can feel a hunger exuding from him.'
 						'<i>Oops. I might have just created a monster,</i> you think to yourself.'
-						act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+						act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 					end
 					act'Play a prank on him':
 						cla & *nl
@@ -747,7 +751,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 							'"What the fuck! Are you fucking kidding me?!"'
 							'"Would you rather I not be?" you giggle, his reactions sending you into another fit. "Would you rather have had your sperm swarming around my unprotected uterus looking for eggs to impregnate?"'
 							'"You know what I mean!" His anger has you cackling further and you have to spray yourself in the face with the shower head just to calm down.'
-							act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+							act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 						end
 					end
 				else
@@ -758,7 +762,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 								'"It''s okay Kolka, I''m on my period right now. I don''t think I can get pregnant on my period."'
 								'His face sighs with visible relief.'
 								'"We got lucky this time. Consider it a freebie," you smile at him.'
-								act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+								act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 							end
 							act'"You need to be more careful!"':
 								cla & *nl
@@ -766,11 +770,11 @@ if $ARGS[0] = 'brother_fuck_cum':
 								'"I know! I know! I''m sorry!"'
 								'You huff out in anger but turn back to face him again anyways.'
 								'"Look, I was on my period this time and I don''t think I can get pregnant on my period. But you should know better! If I wasn''t on my period right now this could have been really bad! So show some self control next time!" He nods fearfully in agreement.'
-								act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+								act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 							end
 						elseif knowpreg = 1:
 							'<i>Well,</i> you think to yourself, <i>I''m already pregnant.</i>'
-							act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+							act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 						else
 							act'"It''s okay, it was an accident"':
 								cla & *nl
@@ -780,7 +784,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 								'"Yeah, I know. I could get pregnant from this. But we''ll just have to hope I don''t. We can''t change it now, we''ll just have to be more careful in the future."'
 								'"The future? You mean..."'
 								'"Yes, I''m still going to keep fucking you Kolka," you smile at him. "Just cause this happened doesn''t mean I''m going to leave you alone. So just learn from the mistake and we''ll move on from it together, okay? Maybe I can buy a morning after pill from the pharmacy later."'
-								act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+								act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 							end
 							act'"You need to be more careful!"':
 								cla & *nl
@@ -792,7 +796,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 								'"Fuck! What the fuck were you thinking?!"'
 								'You continue to swear at your brother for the next minute while he pleads for your forgiveness.'
 								'<i>Maybe I can get a morning after pill from the pharmacy,</i> you think to yourself.'
-								act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+								act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 							end
 							act'"What the fuck!"':
 								cla & *nl
@@ -814,14 +818,14 @@ if $ARGS[0] = 'brother_fuck_cum':
 								'"Well what if you started taking birth control? Then I can cum in you as much any time right?"'
 								'"That''s not the point Kolka. You need to have more self control!"'
 								'<i>Though he is right...</i>'
-								act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+								act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 							end
 						end
 					else
 						'"It''s okay Kolka, I''m on birth control," you lie. His expression melts with visible relief. "So that means you can come inside me as much as you like and you don''t have to worry."'
 						'You wink at him and his jaw drops open. He looks down at your cum dripping pussy and you can feel a hunger exuding from him.'
 						'<i>Oops. I might have just created a monster,</i> you think to yourself. <i>Well it''s not like I could have told him the truth that I''m a magical sex demon now could I?</i>'
-						act'Continue':gt'brother_shower_sex', 'brother_shower_fuck_end'
+						act'Continue':gt'brother_shower_sex', 'ending_route_routine'
 					end
 				end
 			end
@@ -1327,7 +1331,7 @@ end
 
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
-	noShampoo = 1
+	mc_inventory['noshampoo'] = 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
+	mc_inventory['noshampoo'] = 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
+																mc_inventory['noshampoo'] = 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
+									mc_inventory['noshampoo'] = 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
+										mc_inventory['noshampoo'] = 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:

+ 3 - 3
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_tampons =  0 and isprok = 1: isprok = 0 & 'You threw away your used tampon.'
+if Enable_auto_tampons =  0 and isprokp = 1:isprokp = 0 & 'You threw away your used sanitary pad.'
 
 if preg = 1:
 	pregtime = pregchem / 24
@@ -995,7 +995,7 @@ gs 'uni_lessons', 'cikl'
 !!------------------------------------------------------------------------------------------------------------------------
 
 !!resetting moisturizer so it can be used in the morning regardless
-item_moisturizer_time = totminut
+mc_inventory['moisturiser']_time = totminut
 
 if bcream_used >= 1:
 	bcream_used = 0

+ 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
+	mc_inventory['noshampoo'] = 1
 	dynamic $showerdin
 	pcs_hairbsh = 1
 	pcs_makeup = 1

+ 1 - 1
locations/city_kafe.qsrc

@@ -124,7 +124,7 @@ if $ARGS[0] = 'fabi':
 	'His smile broadens and he looks a little less tired. "Ah, so you want to work here? Well why wouldn''t you? Rockabilly music, the greaser subculture, Cadillacs and motorcycles and hamburgers! I love this period of American culture, it''s so vibrant and exciting! I''ve put every ruble I have into making this place the perfect recreation of an American diner from 1958. Who doesn''t love that?"'
 	*nl
 	'A glance around the place shows you that the diner is barely half full, and most of those dining are eating Russian food rather than American. Fabi is still raving about America in the 1950s, talking about Elvis Presley, someone called Carl Perkins and cheeseburgers and French fries. His enthusiasm is honest and infectious, but you came here for a reason, so you clear your throat. "Fabi? About the job?"'
-	'He grins sheepishly. "Sorry, I get carried away sometimes. So, you want to work here. Let me tell you about the job. We''re open every day from 12:00 to 20:00. You''d be working five days a week, Monday through Friday. You''d be expected to arrive between 11:00 and 12:00, before we open, to help get the place ready – if you''re late you don''t work that day. You don''t work, you don''t get paid. Pay is 600 rubles per shift plus whatever you get in tips, and you get paid on the 25th of each month."'
+	'He grins sheepishly. "Sorry, I get carried away sometimes. Let me tell you about the job. We''re open every day except Monday from 12:00 to 20:00 and you''d be working five days a week, Tuesday through Saturday. You''ll be expected to arrive between 11:00 and 12:00 to help get the place ready – if you''re late then you won''t work that day. You don''t work, you don''t get paid. Pay is 600 rubles per shift plus whatever you get in tips, and you get paid on the 25th of each month."'
 	'"Oh, and local regulations say I have to hold your work book as long as you''re employed here," he adds. "So... Are you interested?"'
 
 	act 'Yes':

+ 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

+ 4 - 4
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', 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', 20, 'Cosmetics', 1000, 'mc_inventory[''cosmetics''] >', 'city_market')
+	*P FUNC ('$stock_item', 25, 'Razors (number of shaves)', 300, ' mc_inventory[''razor'']', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Tampons', 160, 'mc_inventory[''tampons'']', '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

+ 3 - 3
locations/city_pharmacy.qsrc

@@ -64,10 +64,10 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	*P func ('$stock_item', 10, 'Ointments for chafing', 372, 'mosolmaz', $curloc, $ARGS[0])
 	*P func ('$stock_item', 20, 'Lubricant', 145, 'lubri', $curloc, $ARGS[0])
 	!!tube of 5 uses as far as I can tell, price is set to that
-	*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', $curloc, $ARGS[0])
+	*P func ('$stock_item', 30, 'Lip balm', 127, 'mc_inventory[''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, 'Tampons', 200, 'mc_inventory[''tampons'']', $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_residential.qsrc

@@ -136,25 +136,25 @@ elseif military = 1:
 	'The military bus will wait between 06:00 and 09:00 on Saturdays.'
 end
 if hour >= 8 and hour <= 14 and week ! 1:
-	'You could go shopping at the noisy local <a href="exec: minut += 10 & gt ''city_market'', ''start''">marketplace</a>.'
+	'You could go shopping at the local <a href="exec: minut += 10 & gt ''city_market'', ''start''">marketplace</a>.'
 else
-	'You could go shopping at the noisy local marketplace, but it''s '+iif(week = 1, 'closed on Mondays.', 'only open between 08:00 and 15:00.')
+	'You could go shopping at the local marketplace, but it''s '+iif(week = 1, 'closed on Mondays.', 'only open between 08:00 and 15:00.')
 end
 if hour >= 8 and hour <= 15 and week < 6:
 	'Near the market is a <a href="exec: minut += 10 & gt ''city_market'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
 else	
 	'Near the market is a tailor shop where you can get your clothes resized if needed. '+iif(week < 6, 'It closes at 16:00.', 'It''s closed on weekends.')
 end
-if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe['job'] = 1:
-	'The side door of <a href="exec: minut += 1 & gt ''city_kafe'', ''work''">"The Roadhouse"</a> is open, allowing employees to enter to begin their shift.'
-elseif hour >= 12 and hour <= 22 and week ! 1:
-	'In a side alley, next to the uniquely styled diner <a href="exec: minut += 1 & gt ''city_kafe'', ''start''">"The Roadhouse"</a>, you can hear some <a href="exec: minut += 1 & gt ''gopnew'', ''start''">gopniks</a> swearing and laughing.'
-elseif hour > 22 or hour <= 3:
-	'You can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a> in the parking lot of "The Roadhouse" diner.'
+if hour >= 11 and hour < 12 and week > 1 and week < 7 and workKafe['job'] = 1:
+	'The side door of <a href="exec: minut += 1 & gt ''city_kafe'', ''work''">The Roadhouse</a> diner is open, allowing you to enter and start your shift.'
+elseif hour >= 12 and hour <= 20 and week ! 1:
+	'You can hear some <a href="exec: minut += 1 & gt ''gopnew'', ''start''">gopniks</a> laughing and swearing in a side alley next to <a href="exec: minut += 1 & gt ''city_kafe'', ''start''">The Roadhouse</a> diner.'
+elseif hour > 20 and hour <= 3:
+	'You can hear some <a href="exec:gt ''gopnew'', ''start''">gopniks</a> laughing and swearing in the parking lot of The Roadhouse diner. The diner itself is currently closed.'
 else
-	'The Roadhouse diner is closed right now. It''s open between 12:00 and 23:00 every day except Monday.'
+	'The Roadhouse diner is currently closed. It''s open between 12:00 and 20:00 every day except Monday.'
 end
-if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec: minut += 1 & gt ''city_smalloffice'', ''start''">cleaning lady</a> is needed.'
+if clener >= 1 and hour >= 7 and hour <= 22: 'There''s a small office building where a <a href="exec: minut += 1 & gt ''city_smalloffice'', ''start''">cleaning lady</a> is needed.'
 
 'The city''s large <a href="exec:minut += 20 & gt ''city_park'', ''start''">central park</a> is a 20 minute walk away.'
 'The city''s only <a href="exec:minut += 40 & gt ''city_lake'', ''start''">lake</a> is a 40 minute walk away.'

+ 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

+ 10 - 10
locations/city_saunawhore.qsrc

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

+ 11 - 13
locations/clothing_QV.qsrc

@@ -1341,7 +1341,17 @@ if $ARGS[0] = 'change':
 					end
 				end
 			else
-				if CloThinness < 6 or $clothingworntype = 'salacious_outfits' or $clothingworntype = 'salacious_dress':	
+				if CloThinness > 6 or $clothingworntype = 'salacious_outfits' or $clothingworntype = 'salacious_dress':
+					act 'Wear this outfit':
+						gs 'clothing', 'wear', $ARGS[1], ARGS[2]
+
+						if $regularwornclothingtype = '':
+							gt 'wardrobe', 'main'
+						else
+							gt 'clothing_QV', 'gym'
+						end
+					end
+				else
 					act 'Wear this outfit':
 						cla
 						*clr		
@@ -1371,16 +1381,6 @@ if $ARGS[0] = 'change':
 							end
 						end
 					end	
-				else
-					act 'Wear this outfit':
-						gs 'clothing', 'wear', $ARGS[1], ARGS[2]
-
-						if $regularwornclothingtype = '':
-							gt 'wardrobe', 'main'
-						else
-							gt 'clothing_QV', 'gym'
-						end
-					end
 				end
 			end	
 		else
@@ -1393,8 +1393,6 @@ if $ARGS[0] = 'change':
 				end
 			end
 		end
-		
-
 	end
 end
 

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

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

+ 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

+ 5 - 5
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><<mc_inventory[''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
+		mc_inventory['noshampoo'] = 1
 		dynamic $showerdin
 		shovertania += 1
 		gs 'stat'
@@ -349,7 +349,7 @@ if $ARGS[0] = 'gym':
 
 	gs 'fit', 'exercise_end'
 
-	if pcs_energy >= 15 or pcs_stam >= stammax / 5:
+	if pcs_energy >= 15 and pcs_stam >= stammax / 5:
 		act 'Aerobics (Burn fat)':
 			cla
 			*clr

+ 10 - 10
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)
+			modelmc_inventory['tampons'] =  rand(1,2)
 			cla
 			isprok = 1
 			minut += 2
-			if modeltampon = 1:
+			if modelmc_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.'
@@ -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
+									mc_inventory['noshampoo'] = 1
 									dynamic $showerdin
 									gs 'boyStat', $boy1
 									spafinloc = 3
@@ -1327,7 +1327,7 @@ if $ARGS[0] = 'blackm':
 									act 'Finally':
 										cla
 										*clr
-										noShampoo = 1
+										mc_inventory['noshampoo'] = 1
 										dynamic $showerdin
 										gs 'boyStat', $boy1
 										gs 'cum_manage'

+ 12 - 12
locations/gadbana.qsrc

@@ -85,7 +85,7 @@ if mira_guest = 0:
 					menu_off = 1
 					minut += 120
 					pcs_sweat = rand(0,5)
-					noShampoo = 1
+					mc_inventory['noshampoo'] = 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'): mc_inventory['noshampoo'] = 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><<mc_inventory[''razor'']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
 	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> on the window sill, which you can use to ' +iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	!WD: heal chafe
 	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:
-		'<font color="red">You have only <b><<tampon>></b> tampon left.</font>'
+	elseif mc_inventory['tampons'] =  1:
+		'<font color="red">You have only <b><<mc_inventory[''tampons'']>></b> tampon left.</font>'
 	else
-		'You have <b><<tampon>></b> tampons.'
+		'You have <b><<mc_inventory[''tampons'']>></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
+				mc_inventory['noshampoo'] = 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><<mc_inventory[''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): mc_inventory['noshampoo'] = 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
+				mc_inventory['noshampoo'] = 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
+				mc_inventory['noshampoo'] = 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
+						mc_inventory['noshampoo'] = 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
+							mc_inventory['noshampoo'] = 1
 							dynamic $showerdin
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/gangaftermath.jpg"></center>'

+ 132 - 133
locations/gschool_break.qsrc

@@ -103,7 +103,15 @@ if $ARGS[0] = 'restroom_actions':
 	end
 	gs 'din_van', 'pblc_pee'
 	act 'Use the mirrors': gt 'mirror', 'start'
-	if siga > 0: act 'Smoke': gt 'gschool_break', 'smoke1'
+	if siga > 0:		
+		act 'Smoke':
+			if rand(0,4) = 0:
+				gt 'gschool_break', 'smoke2'
+			else
+				gt 'gschool_break', 'smoke1'
+			end
+		end
+	end
 
 	dynamic $tampon
 	dynamic $quickwash
@@ -1035,171 +1043,169 @@ if $ARGS[0] = 'smoke2':
 	menu_off = 1
 	minut += 2
 	gs 'stat'
-	if rand (1,5) = 1:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo1.jpg"></center>'
-		'You pull out your pack of cigarettes and fish one out. Placing it between your lips, you light the cigarette and take a long slow drag of it. You hear the other girls all leave, leaving you alone to enjoy your smoke.'
-		gs 'drugs', 'smoke'
-		gs 'stat'
-		act 'Enjoy your smoke':
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo1.jpg"></center>'
+	'You pull out your pack of cigarettes and fish one out. Placing it between your lips, you light the cigarette and take a long slow drag of it. You hear the other girls all leave, leaving you alone to enjoy your smoke.'
+	gs 'drugs', 'smoke'
+	gs 'stat'
+	act 'Enjoy your smoke':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo2.jpg"></center>'
+		'You then hear the bathroom door open, followed by footsteps. Before you can drop the cigarette in the toilet, Ms. Braakman walks over and catches you.'
+		act 'Caught':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo2.jpg"></center>'
-			'You then hear the bathroom door open, followed by footsteps. Before you can drop the cigarette in the toilet, Ms. Braakman walks over and catches you.'
-			act 'Caught':
+			demerit += 10
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo3.jpg"></center>'
+			'Ms. Braakman stops in front of your stall and reaches in and pulls you out of the stall while wagging her finger at you. "Miss <<$pcs_lastname>>, you know the rules about smoking in school."'
+			act 'Apologize':
 				*clr & cla
-				demerit += 10
+				minut += 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo3.jpg"></center>'
-				'Ms. Braakman stops in front of your stall and reaches in and pulls you out of the stall while wagging her finger at you. "Miss <<$pcs_lastname>>, you know the rules about smoking in school."'
-				act 'Apologize':
+				'You swallow, not wanting to make things worse. "I''m sorry Ms. Braakman, I didn''t think anyone would mind." you plead while giving her your saddest look, hoping she''ll let you off with just a warning.'
+				'She takes the cigarette away from you and throws it in the toilet. "Very well. Don''t let me catch you again, or I will report this to Ms. Volkov. This infraction will be added to your demerits. Now get out of here." With that, you hurry out of the bathroom.'
+				act 'Leave': gt 'gschool_lessons', 'short_break'
+			end
+			act 'Blow her off':
+				*clr & cla
+				minut += 1
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo4.jpg"></center>'
+				'You roll your eyes at her. "Fine whatever, I won''t smoke." you say in a sarcastic and insincere tone of voice.'
+				'She pulls the cigarette out of your hand and drops it on the floor. "Don''t talk to me like that, young lady!" she shouts as she grabs you painfully by the hair and pulls your face down until you''re looking at the cigarette as she grinds it under the toe of her shoe. "You will come with me and learn some respect!"'
+				gs 'pain', 1, 'hair', 'twist'
+				gs 'stat'
+				act 'Get pulled along':
 					*clr & cla
 					minut += 2
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo3.jpg"></center>'
-					'You swallow, not wanting to make things worse. "I''m sorry Ms. Braakman, I didn''t think anyone would mind." you plead while giving her your saddest look, hoping she''ll let you off with just a warning.'
-					'She takes the cigarette away from you and throws it in the toilet. "Very well. Don''t let me catch you again, or I will report this to Ms. Volkov. This infraction will be added to your demerits. Now get out of here." With that, you hurry out of the bathroom.'
-					act 'Leave': gt 'gschool_lessons', 'short_break'
-				end
-				act 'Blow her off':
-					*clr & cla
-					minut += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo4.jpg"></center>'
-					'You roll your eyes at her. "Fine whatever, I won''t smoke." you say in a sarcastic and insincere tone of voice.'
-					'She pulls the cigarette out of your hand and drops it on the floor. "Don''t talk to me like that, young lady!" she shouts as she grabs you painfully by the hair and pulls your face down until you''re looking at the cigarette as she grinds it under the toe of her shoe. "You will come with me and learn some respect!"'
-					gs 'pain', 1, 'hair', 'twist'
-					gs 'stat'
-					act 'Get pulled along':
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo5.jpg"></center>'
+					'She lets go of your hair, only to grab you by the ear and painfully twist it and pull you along. She drags you out of the restroom, down the hall, and finally into her currently empty classroom.'
+					gs 'pain', 2, 'ears', 'twist'
+					act 'Learn some manners':
 						*clr & cla
-						minut += 2
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo5.jpg"></center>'
-						'She lets go of your hair, only to grab you by the ear and painfully twist it and pull you along. She drags you out of the restroom, down the hall, and finally into her currently empty classroom.'
-						gs 'pain', 2, 'ears', 'twist'
-						act 'Learn some manners':
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg"></center>'
+						'Once in her classroom, she takes hold of your hair once more and with the other hand uses a meter stick to raise up your chin until you''re looking her in the eyes. "You will learn some manners young lady, one way or another."'
+						act 'Lesson one':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg"></center>'
-							'Once in her classroom, she takes hold of your hair once more and with the other hand uses a meter stick to raise up your chin until you''re looking her in the eyes. "You will learn some manners young lady, one way or another."'
-							act 'Lesson one':
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo7.jpg"></center>'
+							'She turns you around and lifts your skirt. Still holding you by your hair with one hand, her other hand gives your ass cheeks a swift slap, followed by a few more, each one more stinging than the last.'
+							gs 'pain', 1, 'asscheeks', 'spank'
+							gs 'arousal', 'foreplay', 2, 'sub'
+							gs 'stat'
+							act 'Lesson one - part two':
 								*clr & cla
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo7.jpg"></center>'
-								'She turns you around and lifts your skirt. Still holding you by your hair with one hand, her other hand gives your ass cheeks a swift slap, followed by a few more, each one more stinging than the last.'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo8.jpg"></center>'
+								'With her hand in your hair, she forces you to bend over her desk to give her easier access to spank you. She lands several more swats on your ass and it is beginning to sting.'
 								gs 'pain', 1, 'asscheeks', 'spank'
 								gs 'arousal', 'foreplay', 2, 'sub'
 								gs 'stat'
-								act 'Lesson one - part two':
+								act 'Lesson two':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo8.jpg"></center>'
-									'With her hand in your hair, she forces you to bend over her desk to give her easier access to spank you. She lands several more swats on your ass and it is beginning to sting.'
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo9.jpg"></center>'
+									'She finally stops and for a moment you think she is done, but then she grabs the meter stick off the desk and slaps it painfully hard across your ass. She stops and asks: "Have you learned your lesson yet?"'
 									gs 'pain', 1, 'asscheeks', 'spank'
 									gs 'arousal', 'foreplay', 2, 'sub'
 									gs 'stat'
-									act 'Lesson two':
-										*clr & cla
-										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo9.jpg"></center>'
-										'She finally stops and for a moment you think she is done, but then she grabs the meter stick off the desk and slaps it painfully hard across your ass. She stops and asks: "Have you learned your lesson yet?"'
-										gs 'pain', 1, 'asscheeks', 'spank'
-										gs 'arousal', 'foreplay', 2, 'sub'
-										gs 'stat'
 
-										gs 'willpower', 'misc', 'resist', 'medium'
-										if will_cost < pcs_willpwr:
-											act 'No (<<will_cost>> Willpower)':
+									gs 'willpower', 'misc', 'resist', 'medium'
+									if will_cost < pcs_willpwr:
+										act 'No (<<will_cost>> Willpower)':
+											*clr & cla
+											gs 'willpower', 'pay', 'resist'
+											gs 'stat'
+											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo10.jpg"></center>'
+											'You snort a laugh. "You think a little spanking is going to set me on the straight and narrow? <i>Please</i>!"'
+											'She pulls you back up and wraps one arm around your neck, pulls open your shirt and says: "So you think you''re some tough bad girl do you? Well let me show you what happens to bad little girls."'
+											act 'On your knees':
 												*clr & cla
-												gs 'willpower', 'pay', 'resist'
+												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo11.jpg"></center>'
+												'She forces you down to your knees and then your face, all the way against the dirty floor. Slipping out of her shoes, she uses one foot to press your cheek down against the floor while she spanks you more with the meter stick.'
+												gs 'pain', 1, 'asscheeks', 'spank'
+												gs 'arousal', 'foreplay', 2, 'sub'
 												gs 'stat'
-												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo10.jpg"></center>'
-												'You snort a laugh. "You think a little spanking is going to set me on the straight and narrow? <i>Please</i>!"'
-												'She pulls you back up and wraps one arm around your neck, pulls open your shirt and says: "So you think you''re some tough bad girl do you? Well let me show you what happens to bad little girls."'
-												act 'On your knees':
+												act 'Clean my toes':
 													*clr & cla
-													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo11.jpg"></center>'
-													'She forces you down to your knees and then your face, all the way against the dirty floor. Slipping out of her shoes, she uses one foot to press your cheek down against the floor while she spanks you more with the meter stick.'
-													gs 'pain', 1, 'asscheeks', 'spank'
+													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo12.jpg"></center>'
+													'She reaches down and pulls you up into a kneeling position. She forces you to open your mouth and sticks her toes in your mouth. "You''re not a bad little girl. You''re just a dirty little girl. Now clean my feet." She makes you suck on her toes and lick both of her feet.'
 													gs 'arousal', 'foreplay', 2, 'sub'
 													gs 'stat'
-													act 'Clean my toes':
-														*clr & cla
-														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo12.jpg"></center>'
-														'She reaches down and pulls you up into a kneeling position. She forces you to open your mouth and sticks her toes in your mouth. "You''re not a bad little girl. You''re just a dirty little girl. Now clean my feet." She makes you suck on her toes and lick both of her feet.'
-														gs 'arousal', 'foreplay', 2, 'sub'
-														gs 'stat'
-														if grupTipe = 3 or grupTipe = 5 or stat['think_virgin'] = 1:
-															'She finally lets go of you and tosses you back your shirt. "Get dressed and get out before you make things worse for yourself." You gather up your shirt and walk out of the classroom. You button up your shirt with your ass still stinging.'
-															act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
-														else
-															'She pulls her feet away from you, while still holding you by the hair. "So have you had enough?"'
-															gs 'willpower', 'misc', 'resist', 'medium'
-															if will_cost < pcs_willpwr:
-																act 'Screw you bitch (<<will_cost>> Willpower)':
+													if grupTipe = 3 or grupTipe = 5 or stat['think_virgin'] = 1:
+														'She finally lets go of you and tosses you back your shirt. "Get dressed and get out before you make things worse for yourself." You gather up your shirt and walk out of the classroom. You button up your shirt with your ass still stinging.'
+														act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
+													else
+														'She pulls her feet away from you, while still holding you by the hair. "So have you had enough?"'
+														gs 'willpower', 'misc', 'resist', 'medium'
+														if will_cost < pcs_willpwr:
+															act 'Screw you bitch (<<will_cost>> Willpower)':
+																*clr & cla
+																gs 'willpower', 'pay', 'resist'
+																'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo13.jpg"></center>'
+																'"Screw you bitch!" you defiantly yell. Her nostrils flare and she gives you a hard glare.'
+																'"What are you mouthing off at me for? I''m not the one that''s getting screwed here." she says as she takes off her skirt and pulls off her panties before forcing you to strip as well. Once you''re naked, and still on your knees, she turns her ass towards you and grabs you by the hair, pulling you between her ass checks. She uses the meter stick to smack one of your breasts hard enough that it hurts. "Lick!" Not wanting to get smacked again, you start to lick her ass.'
+																gs 'arousal', 'rimming_give', 2, 'sub', 'humiliation'
+																gs 'pain', 1, 'breasts', 'slap'
+																gs 'stat'
+																act 'Eat her':
 																	*clr & cla
-																	gs 'willpower', 'pay', 'resist'
-																	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo13.jpg"></center>'
-																	'"Screw you bitch!" you defiantly yell. Her nostrils flare and she gives you a hard glare.'
-																	'"What are you mouthing off at me for? I''m not the one that''s getting screwed here." she says as she takes off her skirt and pulls off her panties before forcing you to strip as well. Once you''re naked, and still on your knees, she turns her ass towards you and grabs you by the hair, pulling you between her ass checks. She uses the meter stick to smack one of your breasts hard enough that it hurts. "Lick!" Not wanting to get smacked again, you start to lick her ass.'
-																	gs 'arousal', 'rimming_give', 2, 'sub', 'humiliation'
-																	gs 'pain', 1, 'breasts', 'slap'
+																	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo14.jpg"></center>'
+																	'After a few minutes, she pulls your face away from her ass and turns around. She puts one foot on her desk and spreads her legs wide, then pulls your face to her crotch and rubs your face against her pussy. "Lick it, you dirty little girl." You start to lick her pussy as you are told.'
+																	gs 'arousal', 'cuni_give', 2, 'sub', 'humiliation'
 																	gs 'stat'
-																	act 'Eat her':
+																	act 'Suck it':
 																		*clr & cla
-																		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo14.jpg"></center>'
-																		'After a few minutes, she pulls your face away from her ass and turns around. She puts one foot on her desk and spreads her legs wide, then pulls your face to her crotch and rubs your face against her pussy. "Lick it, you dirty little girl." You start to lick her pussy as you are told.'
-																		gs 'arousal', 'cuni_give', 2, 'sub', 'humiliation'
+																		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo15.jpg"></center>'
+																		'She stops and leaves you alone for a minute to rummage in her desk drawer before pulling out a stapon harness. She steps into the harness, pulls it up and tightens the straps in place before she grabs you by the hair again, pulling your face over to the dildo. "Open your mouth." As soon as you do, she drives the dildo into your mouth and starts fucking your mouth.'
+																		gs 'arousal', 'bj', 2, 'sub', 'humiliation'
 																		gs 'stat'
-																		act 'Suck it':
+																		act 'Get fucked':
 																			*clr & cla
-																			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo15.jpg"></center>'
-																			'She stops and leaves you alone for a minute to rummage in her desk drawer before pulling out a stapon harness. She steps into the harness, pulls it up and tightens the straps in place before she grabs you by the hair again, pulling your face over to the dildo. "Open your mouth." As soon as you do, she drives the dildo into your mouth and starts fucking your mouth.'
-																			gs 'arousal', 'bj', 2, 'sub', 'humiliation'
+																			gs 'boyStat', 'D3'
+																			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo16.jpg"></center>'
+																			'After gagging you a couple of times, she slides the dildo out of your mouth and pulls you up into a standing position. She lifts you off your legs and guides the <<dick>>cm <<$dick_girth>> dildo into your pussy. Between your own wetness and your slobber on the dildo, it slides in easily and she starts to fuck you with it.'
+																			gs 'arousal', 'vaginal_strap', 3, 'sub', 'humiliation'
 																			gs 'stat'
-																			act 'Get fucked':
+																			act 'Dirty little girl':
 																				*clr & cla
-																				gs 'boyStat', 'D3'
-																				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo16.jpg"></center>'
-																				'After gagging you a couple of times, she slides the dildo out of your mouth and pulls you up into a standing position. She lifts you off your legs and guides the <<dick>>cm <<$dick_girth>> dildo into your pussy. Between your own wetness and your slobber on the dildo, it slides in easily and she starts to fuck you with it.'
-																				gs 'arousal', 'vaginal_strap', 3, 'sub', 'humiliation'
-																				gs 'stat'
-																				act 'Dirty little girl':
-																					*clr & cla
-																					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo17.jpg"></center>'
-																					if $pantyworntype = 'none':
-																						'Ms. Braakman pushes you down, bending you over her desk. She reaches around and shoves her panties in your mouth before she starts fucking you with the strapon again. Several minutes go by until she finally stops and pulls her panties out of your mouth, obviously tired from the exertion. "Get your clothes and get out!" she demands and you quickly gather up your clothes and get dressed before leaving.'
-																					else
-																						'Ms. Braakman pushes you down, bending you over her desk. She reaches around and shoves your panties in your mouth before she starts fucking you with the strapon again. Several minutes go by until she finally stops, obviously tired from the exertion. "Get your clothes and get out!" she demands and you quickly gather up your clothes, pull your panties out of your mouth and get dressed before leaving.'
-																						gs 'arousal', 'vaginal_strap', 3, 'sub', 'humiliation'
-																						gs 'arousal', 'end'
-																						gs 'stat'
-																						act 'Leave': gt 'gschool_lessons', 'short_break'
-																					end
+																				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo17.jpg"></center>'
+																				if $pantyworntype = 'none':
+																					'Ms. Braakman pushes you down, bending you over her desk. She reaches around and shoves her panties in your mouth before she starts fucking you with the strapon again. Several minutes go by until she finally stops and pulls her panties out of your mouth, obviously tired from the exertion. "Get your clothes and get out!" she demands and you quickly gather up your clothes and get dressed before leaving.'
+																				else
+																					'Ms. Braakman pushes you down, bending you over her desk. She reaches around and shoves your panties in your mouth before she starts fucking you with the strapon again. Several minutes go by until she finally stops, obviously tired from the exertion. "Get your clothes and get out!" she demands and you quickly gather up your clothes, pull your panties out of your mouth and get dressed before leaving.'
+																					gs 'arousal', 'vaginal_strap', 3, 'sub', 'humiliation'
+																					gs 'arousal', 'end'
+																					gs 'stat'
+																					act 'Leave': gt 'gschool_lessons', 'short_break'
 																				end
 																			end
 																		end
 																	end
 																end
-															else
-																act 'Screw you bitch (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-															end
-															act 'Yes':
-																*clr & cla
-																'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg"></center>'
-																'You nod your head as best you can. "Yes Ms. Braakman, I''m sorry"'
-																'She pulls you back up into a standing position and places the end of the meter stick just under your jaw. "Now that''s better. Perhaps next time you will behave yourself. I will, of course, have to report this to Ms. Volkov. Now get out and behave!"'
-																gs 'arousal', 'end'
-																gs 'stat'
-																act 'Leave': gt 'gschool_lessons', 'short_break'
 															end
+														else
+															act 'Screw you bitch (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+														end
+														act 'Yes':
+															*clr & cla
+															'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg"></center>'
+															'You nod your head as best you can. "Yes Ms. Braakman, I''m sorry"'
+															'She pulls you back up into a standing position and places the end of the meter stick just under your jaw. "Now that''s better. Perhaps next time you will behave yourself. I will, of course, have to report this to Ms. Volkov. Now get out and behave!"'
+															gs 'arousal', 'end'
+															gs 'stat'
+															act 'Leave': gt 'gschool_lessons', 'short_break'
 														end
 													end
 												end
 											end
-										else
-											act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end
+									else
+										act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+									end
 
-										act 'Yes':
-											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg"></center>'
-											'You nod your head as best you can. "Yes Ms. Braakman, I''m sorry"'
-											'She pulls you back up into a standing position and places the end of the meter stick just under your jaw. "Now that''s better. Perhaps next time you will behave yourself. I will, of course, have to report this to Ms. Volkov. Now get out of here and behave!"'
-											gs 'arousal', 'end'
-											gs 'stat'
-											act 'Leave': gt 'gschool_lessons', 'short_break'
-										end
+									act 'Yes':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg"></center>'
+										'You nod your head as best you can. "Yes Ms. Braakman, I''m sorry"'
+										'She pulls you back up into a standing position and places the end of the meter stick just under your jaw. "Now that''s better. Perhaps next time you will behave yourself. I will, of course, have to report this to Ms. Volkov. Now get out of here and behave!"'
+										gs 'arousal', 'end'
+										gs 'stat'
+										act 'Leave': gt 'gschool_lessons', 'short_break'
 									end
 								end
 							end
@@ -1208,13 +1214,6 @@ if $ARGS[0] = 'smoke2':
 				end
 			end
 		end
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo1.jpg"></center>'
-		'You pull out your pack of cigarettes and fish one out. Placing it between you lips, you light the cigarette and take a long slow drag of it. You spend a few minutes smoking the cigarette before dropping the bud into the toilet.'
-		gs 'drugs', 'smoke'
-		gs 'stat'
-
-		act 'Continue your break': gt $loc, $loc_arg
 	end
 end
 

+ 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><<mc_inventory[''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.'

+ 2 - 2
locations/gschool_lessonsev1.qsrc

@@ -289,7 +289,7 @@ if $ARGS[0] = 'biology':
 								$orgasm_or = 'yes'
 								gs 'arousal', 'clit_finger', 10, 'masturbate', 'exhibitionism'
 								gs 'arousal', 'end'
-								'You spend the rest of class with Dan''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
+								'You spend the rest of class with Dan''s hand playing with your breast as you just sit there in a small puddle of your own juices, completely satisfied.'
 							end
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -961,7 +961,7 @@ if $ARGS[0] = 'computer':
 								$orgasm_or = 'yes'
 								gs 'arousal', 'clit_finger', 10, 'masturbate', 'exhibitionism'
 								gs 'arousal', 'end'
-								'You spend the rest of class with Vasily''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
+								'You spend the rest of class with Vasily''s hand playing with your breast as you just sit there in a small puddle of your own juices, completely satisfied.'
 							end
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end

+ 4 - 4
locations/gschool_sex.qsrc

@@ -745,7 +745,7 @@ if $ARGS[0] = 'storagesex':
 										minut += 10
 										pcs_mood += 10
 										shower_shave = 0
-										noShampoo = 0
+										mc_inventory['noshampoo'] = 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
+								mc_inventory['noshampoo'] = 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
+			mc_inventory['noshampoo'] = 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
+					mc_inventory['noshampoo'] = 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.'

+ 2 - 40
locations/home_activity.qsrc

@@ -310,47 +310,9 @@ if $ARGS[0] = 'vomiting_exit':
 	vomit['hangover'] = 0
 	vomit['unlucky'] = 0
 
-	gt $loc, $loc_arg
+	gt $home['bathroom'], $home['bathroom_arg']
 end
 
-!!{ backup stuff
-
-	  if at_home = 1:
-			!! location = 'City residential apartment'
-			gt 'vanr'
-		elseif $loc = 'bedrPar':
-			!! location = 'Parent''s home in Pavlovsk'
-			gt 'vanrPar'
-		elseif at_home = 3:
-			!! location = 'My cottage in the cooperative farm'
-			gt 'dachain', 'dachabath'
-		elseif at_home = 4:
-			!! location = 'Old town apartment'
-			gt 'vanr2x'
-		elseif $home['current'] = 5:
-			!! location = 'Matryona mansion'
-			gt'city_mansion_residence_1','ybathroom'
-		elseif at_home = 6:
-			!! location = 'My hotel room in Pavlovsk'
-			gt 'HotelRoom', 'shower1'
-	!!{	elseif at_home = 9:
-			!! location = 'Uncle Sergey''s apartment'
-			$home_activity['vomit_bedroom'] = ''
-			$home_activity['vomit_bathroom'] = ''
-
-			gt 'vasilyhome', 'bathroom'}
-		elseif at_home = 13:
-			gt 'pav_shared_apt', 'bathroom'
-	!!{	elseif at_home = 14:
-			!! location = 'Grandparent''s house in Gadukino'
-			$home_activity['vomit_bedroom'] = ''
-			$home_activity['vomit_bathroom'] = ''}
-		elseif at_home = 15:
-			!! location = 'City residential house'
-			gt 'city_house_res_bathr', 'bathr'
-		elseif $loc = 'mey_home':
-			!! location = 'Meynold Household'
-			gt 'mey_home', 'bathroom'
-		end}
 !! --------------- end vomiting ----------------------------
+
 --- home_activity ---------------------------------

+ 7 - 1
locations/homes_properties.qsrc

@@ -1031,11 +1031,17 @@ if $ARGS[0] = 'go_home':
 end
 
 !! Call: `gs 'homes_properties', 'go_straight_home'
-!! Takes Sveta to the entracne of her home
+!! Takes Sveta to the entrance of her home
 if $ARGS[0] = 'go_straight_home':
 	gt $home['entrance'], $home['entrance_arg']
 end
 
+!! Call: `gs 'homes_properties', 'go_bathroom_home'
+!! Takes Sveta to the bathroom of her home
+if $ARGS[0] = 'go_bathroom_home':
+	gt $home['bathroom'], $home['bathroom_arg']
+end
+
 
 !! Returns 0 if the property doesn''t give free internet access, and 1 or -1 if it does
 !!

+ 33 - 1
locations/homes_properties_attr.qsrc

@@ -185,6 +185,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'korr'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'vanr'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 
 		property['price'] = 800000
@@ -202,6 +204,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = 'start'
  		$property['entrance'] = 'korrPar'
 		$property['entrance_arg'] = 'start'
+		$property['bathroom'] = 'vanrPar'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 		
 		property['free_internet'] = 1	
@@ -215,6 +219,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'dachamy'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'dachabath'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 
 		property['price'] = 150000
@@ -230,6 +236,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'korr2x'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'vanr2x'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 		
 		property['rental'] = 1
@@ -247,6 +255,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'city_mansion_residence_1'
 		$property['entrance_arg'] = 'yfoyer'
+		$property['bathroom'] = 'city_mansion_residence_1'
+		$property['bathroom_arg'] = 'ybathroom'
 		$property['type'] = 'permanent_residence'
 
 		property['price'] = 1500000
@@ -262,6 +272,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'pav_hotel'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'HotelRoom'
+		$property['bathroom_arg'] = 'shower1'
 		$property['type'] = 'temporary_residence'
 
 		property['free_internet'] = 1	
@@ -275,6 +287,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'nichBedroomServant'
 		$property['entrance_arg'] = 'start'
+		$property['bathroom'] = 'nichBathServant'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 
 		property['free_internet'] = 1	
@@ -288,6 +302,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'pav_residential'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'pav_residential'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'temporary_residence'
 	elseif $ARGS[1] = 'shulga_apartment':
 		property['id'] = 9
@@ -299,6 +315,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = 'start'
 		$property['entrance'] = 'vasilyhome'
 		$property['entrance_arg'] = 'hallway'
+		$property['bathroom'] = 'vasilyhome'
+		$property['bathroom_arg'] = 'bathroom'
 		$property['type'] = 'temporary_residence'
 
 		property['free_internet'] = 1	
@@ -312,6 +330,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'etoexhib'
 		$property['entrance_arg'] = 'pos40'
+		$property['bathroom'] = 'etoexhib'
+		$property['bathroom_arg'] = 'pos41'
 		$property['type'] = 'permanent_residence'
 
 		property['free_internet'] = 1	
@@ -325,6 +345,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'uni_dorm'
 		$property['entrance_arg'] = 'dorm_room'
+		$property['bathroom'] = 'uni_dorm'
+		$property['bathroom_arg'] = 'womens_restroom'
 		$property['type'] = 'permanent_residence'
 
 		property['free_internet'] = 1		
@@ -338,6 +360,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = 'start'
 		$property['entrance'] = 'swamphouse'
 		$property['entrance_arg'] = 'start'
+		$property['bathroom'] = 'swamphouse'
+		$property['bathroom_arg'] = 'washstand'
 		$property['type'] = 'temporary_residence'
 	elseif $ARGS[1] = 'shared_apartment':
 		property['id'] = 13
@@ -349,6 +373,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = 'start'
 		$property['entrance'] = 'pav_shared_apt'
 		$property['entrance_arg'] = 'start'
+		$property['bathroom'] = 'pav_shared_apt'
+		$property['bathroom_arg'] = 'bathroom'
 		$property['type'] = 'temporary_residence'
 
 		property['free_internet'] = 1	
@@ -362,6 +388,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'gaddvor'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'vanr'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'temporary_residence'
 	elseif $ARGS[1] = 'city_house':
 		property['id'] = 15
@@ -372,7 +400,9 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location'] = 'city_residential'
 		$property['location_arg'] = ''
 		$property['entrance'] = 'city_house_res_misc'
-		$property['entrance_arg'] = 'fronty'		
+		$property['entrance_arg'] = 'fronty'	
+		$property['bathroom'] = 'city_house_res_bathr'
+		$property['bathroom_arg'] = 'bathr'	
 		$property['type'] = 'permanent_residence'
 		
 		property['price'] = 800000
@@ -387,6 +417,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'mey_home'
 		$property['entrance_arg'] = 'door'
+		$property['bathroom'] = 'mey_home'
+		$property['bathroom_arg'] = 'bathroom'
 		$property['type'] = 'temporary_residence'
 
 		property['free_internet'] = 1

+ 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
+	mc_inventory['noshampoo'] = 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 (<<mc_inventory['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

+ 148 - 0
locations/item_cart.qsrc

@@ -0,0 +1,148 @@
+# item_cart
+
+if $ARGS[0] = 'shoppping_aisle':
+    $curr_aisle = $ARGS[1]
+	gs 'item_stock_db', $ARGS[1]
+	gs 'item_cart', 'header'
+	'<center><table><<$Headerstring>><TR><border=1>'
+
+	i = 1
+	:loopshopping_cart
+		gs 'themes', 'clothing', 1
+		$item_line = '<TR bgcolor='+$bgcolor+'>'
+		$item_line += '<TD align="left"><<$item_curr_aisle[''<<i>>'']>><\TD>'
+		dynamic '$cart_tmp = $item_curr_aisle[''<<i>>'']'
+		$item_line += '<TD><<mc_inventory[''<<$cart_tmp>>'']>><\TD>'
+		$item_line += '<TD><<quantity_curr_aisle[''<<i>>'']>><\TD>'
+		$item_line += '<TD><<cost_curr_aisle[''<<i>>'']>><\TD>'
+		if cart_curr_quantity['<<i>>'] < 10:
+			$item_line += '<TD><\TD>'
+		else
+			$item_line += '<TD><a href="exec:gt ''item_cart'', ''remove10'', <<i>>">remove</a><\TD>'
+		end
+		if cart_curr_quantity['<<i>>'] < 1:
+			$item_line += '<TD><\TD>'
+		else
+			$item_line += '<TD><a href="exec:gt ''item_cart'', ''remove'', <<i>>">remove</a><\TD>'
+		end
+		$item_line += '<TD><<cart_curr_quantity[''<<i>>'']>><\TD>'
+		if max_curr_aisle['<<i>>'] > cart_curr_quantity['<<i>>']:
+			$item_line += '<TD><a href="exec:gt ''item_cart'', ''add'', <<i>>">add</a><\TD>'
+		else
+			$item_line += '<TD>Max<\TD>'
+		end
+		if max_curr_aisle['<<i>>'] > cart_curr_quantity['<<i>>'] + 10:
+			$item_line += '<TD><a href="exec:gt ''item_cart'', ''add10'', <<i>>">add</a><\TD>'
+		else
+			$item_line += '<TD><\TD>'
+		end
+		$item_line
+		i += 1
+	if i < item_idx:jump 'loopshopping_cart'
+	'</table></center>'
+	gs 'item_cart', 'cart_total'
+end
+
+if $ARGS[0] = 'header':
+	gs 'themes', 'clothing', 1
+	$Headerstring = '<TH bgcolor='+$bgcolor+'>Item</TH><TH bgcolor='+$bgcolor+'>You own</TH><TH bgcolor='+$bgcolor+'>Units/pack</TH><TH bgcolor='+$bgcolor+'>Cost in <b>₽</b></TH><TH bgcolor='+$bgcolor+'>Remove 10</TH><TH bgcolor='+$bgcolor+'>Remove 1 pack</TH><TH bgcolor='+$bgcolor+'>In cart</TH><TH bgcolor='+$bgcolor+'>Add one pack</TH><TH bgcolor='+$bgcolor+'>Add 10</TH>'
+end
+
+if $ARGS[0] = 'remove':
+	cart_tally -= cost_curr_aisle['<<ARGS[1]>>']
+	cart_curr_quantity['<<ARGS[1]>>'] -= 1
+	gt $loc_s, $args_s
+end
+
+if $ARGS[0] = 'remove10':
+	cart_tally -= cost_curr_aisle['<<ARGS[1]>>']*10
+	cart_curr_quantity['<<ARGS[1]>>'] -= 10
+	gt $loc_s, $args_s
+end
+
+if $ARGS[0] = 'add':
+	cart_tally += cost_curr_aisle['<<ARGS[1]>>']
+	cart_curr_quantity['<<ARGS[1]>>'] += 1
+	gt $loc_s, $args_s
+end
+
+if $ARGS[0] = 'add10':
+	cart_tally += cost_curr_aisle['<<ARGS[1]>>']*10
+	cart_curr_quantity['<<ARGS[1]>>'] += 10
+	gt $loc_s, $args_s
+end
+
+if $ARGS[0] = 'cart_total':
+	'<center><table><TD bgcolor='+$bgcolor+'><b>Total cost of items in cart: <<cart_tally>>₽</b><\TD></table></center>'
+	'<center><table><TR><border=30>'
+	if cart_tally > karta + bankDebtLimit and cart_tally > money:
+		$item_line[2] = '<TD>You cannot afford this<\TD><TD><\TD>'
+	elseif cart_tally = 0:
+		$item_line[2] = '<TD><\TD><TD><\TD>'
+	else
+		if cart_tally <= money:
+			$item_line[2] = '<TD bgcolor='+$bgcolor+'><a href="exec:gt ''item_cart'', ''cash'', <<i>>">Buy (cash)</a><\TD>'
+		else
+			$item_line[2] = '<TD bgcolor='+$bgcolor+'>Not enough cash<\TD>'
+		end
+		if cart_tally <= karta + bankDebtLimit:
+			$item_line[2] += '<TD bgcolor='+$bgcolor+'><a href="exec:gt ''item_cart'', ''card'', <<i>>">Buy (card)</a><\TD>'
+		else
+			$item_line[2] += '<TD bgcolor='+$bgcolor+'>Not enough on card<\TD>'
+		end
+	end
+	$item_line[2] += '<TD bgcolor='+$bgcolor+'><a href="exec:gt ''item_cart'', ''cancel'', <<i>>">cancel</a><\TD>'
+	$item_line[2]
+	'</table></center>'
+end
+!!{
+if $ARGS[0] = 'shoppping_cart':
+    cart_idx = 0
+	cart_shoppingCost = 0
+    :cart_checkout
+        if tmp_$var_$curr_aisle['cart_idx']['cart_idx'] > 0:
+            basket total += tmp_$curr_aisle['cart_idx'] * cost_$curr_aisle['cart_idx']                           
+        end
+   if idx < arrsize($item_$curr_aisle): idx += 1 & jump 'cart_checkout'
+	'<center>Total cost of shopping:' + cart_tally + '<b>₽</b></center>'
+end
+}
+
+if $ARGS[0] = 'cash':
+	i = 1
+	:loopshopping_cash
+		$cart_tmp1 = $item_curr_aisle['<<i>>']
+		dynamic 'mc_inventory[''<<$cart_tmp1>>''] += cart_curr_quantity[''<<i>>'']'
+		i += 1
+	if i < item_idx:jump 'loopshopping_cash'
+	money -= cart_tally
+	gs 'item_cart', 'shopping_var_clear'
+	gt $loc_s, $args_s
+end
+
+if $ARGS[0] = 'card':
+	i = 1
+	:loopshopping_card
+		$cart_tmp1 = $item_curr_aisle['<<i>>']
+		dynamic 'mc_inventory[''<<$cart_tmp1>>''] += cart_curr_quantity[''<<i>>'']'
+		i += 1
+	if i < item_idx:jump 'loopshopping_card'
+	karta -= cart_tally
+	gs 'item_cart', 'shopping_var_clear'
+	gt $loc_s, $args_s
+end
+
+if $ARGS[0] = 'cancel':
+	gs 'item_cart', 'shopping_var_clear'
+	gt $loc_s, $args_s
+end
+
+if $ARGS[0] = 'shopping_var_clear':
+    !! clean up all transient variables/arrays.
+    killvar 'cart_tally'
+    killvar 'cart_curr_quantity'
+end
+
+
+--- item_cart ---------------------------------
+

+ 198 - 0
locations/item_stock_db.qsrc

@@ -0,0 +1,198 @@
+# item_stock_db
+
+!! Date Created: 21st Aug, 2023
+!! Modified date: 
+!! Version: .01 - initial release
+!! Author: Myles Croft
+!! Description: Part of the variable migration, centralising all item variables into one database
+!! to make management of items easier to change, add or remove automatically within the code base.
+!! Each section refers to shop aisle.
+
+!! Item template to C&P
+!! item_idx = ''
+!! $item_curr_aisle['<<item_idx>>'] = '' 
+!! $var_curr_aisle['<<item_idx>>'] = ''
+!! $desc_curr_aisle['<<item_idx>>'] = ''
+!! quantity_curr_aisle['<<item_idx>>'] = ''
+!! max_curr_aisle['<<item_idx>>'] = ''
+!! cost_curr_aisle['<<item_idx>>'] = ''
+!! $img_curr_aisle['<<item_idx>>'] = ''
+
+
+
+if $ARGS[0] = 'beauty':
+    !! Stock Item construct
+    !! Var facing name
+    item_idx = 1
+    $item_curr_aisle['<<item_idx>>'] = 'Cosmetics' 
+    !! Var internal
+    $var_curr_aisle['<<item_idx>>'] = 'Cosmetics'
+    !! Item help
+    $desc_curr_aisle['<<item_idx>>'] = 'A collection of lotions, powders and potions that make you look Fabulous. This isn''t witchcraft honest!'
+    !! Item quantity 
+    quantity_curr_aisle['<<item_idx>>'] = '50'
+	!! maximum that Sveta can own - 0 for unlimited
+	max_curr_aisle['<<item_idx>>'] = '0'
+    !! Item price
+    cost_curr_aisle['<<item_idx>>'] = '1300'
+    !! Path to product image - if set
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+
+    item_idx = 2
+    $item_curr_aisle['<<item_idx>>'] = 'Moisturiser' 
+    $var_curr_aisle['<<item_idx>>'] = 'Moisturiser'
+    $desc_curr_aisle['<<item_idx>>'] = 'Cream that pampers and improves your skin condition.'
+    quantity_curr_aisle['<<item_idx>>'] = '30'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '2100'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+
+    item_idx = 3
+    $item_curr_aisle['3'] = 'Lipbalm' 
+    $var_curr_aisle['<<item_idx>>'] = 'lipbalm'
+    $desc_curr_aisle['<<item_idx>>'] = 'To improve your looks and give your lips that extra oomph.'
+    quantity_curr_aisle['<<item_idx>>'] = '30'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '127'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 4
+    $item_curr_aisle['4'] = 'Plain false lashes' 
+    $var_curr_aisle['<<item_idx>>'] = 'eyelash_fake'
+    $desc_curr_aisle['<<item_idx>>'] = 'Cheap eyelashes that to your eyelashes simple volume.'
+    quantity_curr_aisle['<<item_idx>>'] = '10'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '1500'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 5
+    $item_curr_aisle['5'] = 'Mink false lashes'
+    $var_curr_aisle['<<item_idx>>'] = 'eyelash_mink'
+    $desc_curr_aisle['<<item_idx>>'] = 'Luxurious eyelashes that make your eyes pop, screams glamour baby.'
+    quantity_curr_aisle['<<item_idx>>'] = '3'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '900'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 6
+    $item_curr_aisle['6'] = 'Razors' 
+    $var_curr_aisle['<<item_idx>>'] = 'razor'
+    $desc_curr_aisle['<<item_idx>>'] = 'A basic necessity for all body health care.'
+    quantity_curr_aisle['<<item_idx>>'] = '25'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '350'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 7
+    $item_curr_aisle['7'] = 'Sunblock'
+    $var_curr_aisle['<<item_idx>>'] = 'suncream'
+    $desc_curr_aisle['<<item_idx>>'] = 'Keeps the nasty sun from damaging your skin.'
+    quantity_curr_aisle['<<item_idx>>'] = '20'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '500'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 8
+    $item_curr_aisle['8'] = 'Deodorant' 
+    $var_curr_aisle['<<item_idx>>'] = 'deodorant'
+    $desc_curr_aisle['<<item_idx>>'] = 'Helps prevents the obnoxious sweat pits condition.'
+    quantity_curr_aisle['<<item_idx>>'] = '40'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '200'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 9
+    $item_curr_aisle['9'] = 'Tampons' 
+    $var_curr_aisle['<<item_idx>>'] = 'tampons'
+    $desc_curr_aisle['<<item_idx>>'] = 'A discrete version that helps with that time of the month.'
+    quantity_curr_aisle['<<item_idx>>'] = '20'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '400'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 10 
+    $item_curr_aisle['10'] = 'Sanitary napkins' 
+    $var_curr_aisle['<<item_idx>>'] = 'sanitary_pads'
+    $desc_curr_aisle['<<item_idx>>'] = 'Cheap product that helps with that time of month.'
+    quantity_curr_aisle['<<item_idx>>'] = '20'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '100'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 11
+    $item_curr_aisle['11'] = 'Shampoo' 
+    $var_curr_aisle['<<item_idx>>'] = 'shampoo'
+    $desc_curr_aisle['<<item_idx>>'] = 'To your keep your hair luxurious and shiny.'
+    quantity_curr_aisle['<<item_idx>>'] = '30'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '250'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 12
+    $item_curr_aisle['12'] = 'Hair scrunchies' 
+    $var_curr_aisle['<<item_idx>>'] = 'scrunchies'
+    $desc_curr_aisle['<<item_idx>>'] = 'Simple hair bands to do pony tails, pigtails and other styles.'
+    quantity_curr_aisle['<<item_idx>>'] = '10'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '80'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 13
+    $item_curr_aisle['13'] = 'Hair pins' 
+    $var_curr_aisle['<<item_idx>>'] = 'bobbypins'
+    $desc_curr_aisle['<<item_idx>>'] = 'The old classic bobby pins for when you want to go the extra mile with hairstyles.'
+    quantity_curr_aisle['<<item_idx>>'] = '10'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '100'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 14
+    $item_curr_aisle['14'] = 'Cosmetic Wipes'
+    $var_curr_aisle['<<item_idx>>'] = 'makeup_wipes'
+    $desc_curr_aisle['<<item_idx>>'] = 'Wipe away those sins and remove your make up.'
+    quantity_curr_aisle['<<item_idx>>'] = '10'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '50'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 15
+    $item_curr_aisle['15'] = 'Portable makeup'
+    $var_curr_aisle['<<item_idx>>'] = 'travel_makeup'
+    $desc_curr_aisle['<<item_idx>>'] = 'For those moments when you need touch up your make up.'
+    quantity_curr_aisle['<<item_idx>>'] = '10'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '700'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 16
+    $item_curr_aisle['16'] = 'Mouthwash'
+    $var_curr_aisle['<<item_idx>>'] = 'mouthwash'
+    $desc_curr_aisle['<<item_idx>>'] = 'Keeps your breath fresh and minty!'
+    quantity_curr_aisle['<<item_idx>>'] = '20'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '150'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 17
+    $item_curr_aisle['17'] = 'Comb'
+    $var_curr_aisle['<<item_idx>>'] = 'comb'
+    $desc_curr_aisle['<<item_idx>>'] = 'Prevents you getting entangled in your hair, and other hair disasters.'
+    quantity_curr_aisle['<<item_idx>>'] = '1'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '150'
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 18
+    $item_curr_aisle['18'] = 'Compact Mirror'
+    $var_curr_aisle['<<item_idx>>'] = 'travel_mirror'
+    $desc_curr_aisle['<<item_idx>>'] = 'For when you need touch up your make up, spy or send an SOS.'
+    quantity_curr_aisle['<<item_idx>>'] = '1'
+	max_curr_aisle['<<item_idx>>'] = '0'
+    cost_curr_aisle['<<item_idx>>'] = '1150'
+    $img_curr_aisle['<<item_idx>>'] = ''
+end
+
+--- item_stock_db ---------------------------------
+

+ 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['lipbalm'] += 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['lipbalm'] += 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
+		mc_inventory['noshampoo'] = 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['lipbalm']  = 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
+						mc_inventory['noshampoo'] = 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
+						mc_inventory['noshampoo'] = 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_lipbalm  = 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
+				mc_inventory['noshampoo'] = 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
+				mc_inventory['noshampoo'] = 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
+												mc_inventory['noshampoo'] = 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
+									mc_inventory['noshampoo'] = 1
 									dynamic $showerdin
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/bath_qw10.jpg"></center>'

+ 80 - 78
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['lipbalm']  > 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['lipbalm'] > 0: *pl ' | Lip gloss: <<mc_inventory[''lipbalm'']>>' else *pl ' You have no lip gloss left.'
+	if mc_inventory['eyelash_fake'] > 0: *nl 'False lashes: <<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 mc_inventory['lipbalm']  > 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
@@ -471,7 +471,9 @@ if $ARGS[0] = 'start':
 	killvar 'serv'
 
 	act '<<iif(newstylemirror,''Change to the old style mirror'',''Change to the new style mirror'')>>': newstylemirror = iif(newstylemirror,0,1) & gt 'mirror','start'
-end &! --- start ---
+end 
+
+!! --- start ---
 
 
 $createcustroutine = {
@@ -492,10 +494,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 custmc_inventory['lipbalm']  = 0:
+		'You currently have no lip balm selected: <a href="exec:custmc_inventory[''lipbalm'']  = 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:custmc_inventory[''lipbalm'']  = 0 & dynamic $createcustroutine">Remove Lipbalm to routine</a>'
 	end
 	*nl
 	'Cycle lash options'
@@ -663,9 +665,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 +675,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 +707,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,7 +716,7 @@ end &! --- works ----
 if $ARGS[0] = 'applyLipbalm':
 	if lipbalm > 0 and pcs_lipbalm <= 0:
 		minut += 1
-		lipbalm -= 1
+		mc_inventory['lipbalm'] -= 1
 		lipkoef += rand(0, 1)
 		if lipkoef > 50:
 			lipkoef = 0
@@ -726,9 +728,9 @@ if $ARGS[0] = 'applyLipbalm':
 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 +739,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 +765,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><<mc_inventory[''travel_makeup'']>></b>', 'no')+' cosmetic applications and '+iif(mc_inventory['makeup_wipes'] > 0, '<b><<mc_inventory[''makeup_wipes'']>></b>', 'no')+' tissues left in your purse.'
 	*nl
 	if pcs_hairbsh < 1: '<a href="exec: pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	if 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 mc_inventory['travel_makeup']  >= 1) or (makeupSetting = 2 and mc_inventory['travel_makeup']  >= 2) or (makeupSetting = 3 and mc_inventory['travel_makeup']  >= 3) or (makeupSetting = 4 and mc_inventory['travel_makeup']  >= 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 +790,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 mc_inventory['travel_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>Light make-up</b></a>'
+	if mc_inventory['travel_makeup']  >= 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 mc_inventory['travel_makeup']  >= 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 mc_inventory['travel_makeup']  >= 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 +802,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)
+			modelmc_inventory['tampons'] =  rand(1,2)
 			cla
 			isprok = 1
 			minut += 5
-			if modeltampon = 1:
+			if modelmc_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
+		mc_inventory['noshampoo'] = 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
+		mc_inventory['noshampoo'] = 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
+						mc_inventory['noshampoo'] = 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
+				mc_inventory['noshampoo'] = 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

+ 5 - 4
locations/pav_pharmacy.qsrc

@@ -85,8 +85,8 @@ if $ARGS[0] = 'start':
 		*P func ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'pav_pharmacy', '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, 'Tampons', 200, 'mc_inventory[''tampons'']', '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')
@@ -115,8 +115,8 @@ if $ARGS[0] = 'start':
 		*P func ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'pav_pharmacy', 'buy_lube')
 		*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, 'Tampons', 200, 'mc_inventory[''tampons'']', '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')
@@ -358,6 +358,7 @@ if $ARGS[0] = 'buy_birth_control':
 			if pharmacy['morning_after'] > 2 or pharmacyfirstpregtest > 0:
 				'"Erm... yes aunt. I need some <i>stuff</i>," you say looking meaningfully at the birth control pills.'
 				'"Well it''s about time," Luda says, rolling her eyes dramatically, swiftly grabbing a package and placing it on top of the counter. "I was wondering how many accidents you''d go through before you would wise up and do the safe thing."'
+				act 'Continue':gt 'pav_pharmacy', 'start'
 			elseif fame['pav_slut'] > 150:
 				LudaQW['knows_sex'] = 1
 				'"Erm... yes aunt. I need some <i>stuff</i>," you say, looking to the side, avoiding eye contact.'

+ 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['lipbalm'] += 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
+	mc_inventory['noshampoo'] = 1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.