Merge https://git.tfgames.site/Kevin_Smarts/glife

locations/Cheatmenu_din.qsrc

@@ -3298,8 +3298,8 @@ $cheatmenu['items'] = {
 	if showFoodItems = 1:
 		'<a href = "exec: showFoodItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
 		*pl 'Regular food: <a href="exec:eda=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<eda>> </b></a>'
-		*pl 'Diet food: <a href="exec:edad=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<edad>> </b></a>'
-		*pl 'Tea biscuits: <a href="exec:pranik=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<pranik>> </b></a>'
+		*pl 'Diet food: <a href="exec:mc_inventory['food_diet']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory['food_diet']>> </b></a>'
+		*pl 'Tea biscuits: <a href="exec:mc_inventory['food_biscuits']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory['food_biscuits']>> </b></a>'
 
 		if bag > 0:
 			if bottle = 0:
@@ -3309,11 +3309,11 @@ $cheatmenu['items'] = {
 				*pl 'Bottle of water: <a href="exec:bottle = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 			end
 
-			if buterbrod = 0:
-				*pl 'Sandwich: <a href="exec:buterbrod = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+			if mc_inventory['food_sandwich'] = 0:
+				*pl 'Sandwich: <a href="exec:mc_inventory['food_sandwich'] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 			end
-			if buterbrod = 1:
-				*pl 'Sandwich: <a href="exec:buterbrod = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+			if mc_inventory['food_sandwich'] = 1:
+				*pl 'Sandwich: <a href="exec:mc_inventory['food_sandwich'] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 			end
 
 			if wine = 0:

locations/_stock_item_info.qsrc

@@ -32,7 +32,6 @@ $item_info[mc_inventory['razor']] = '<center><b>Razors</b></center><br>Cheap and
 $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.'
-$item_info['buterbrod'] = '<center><b>Sandwich</b></center><br>A single serving deli-style sandwich to satisfy hunger for the moment.'
 $item_info['wine'] = '<center><b>Cheap Bottle of wine</b></center><br>It tastes kind of bad, but it is cheap and gets the job of getting drunk done if you drink enough of it.'
 $item_info['fashmag'] = '<center><b>Fashion magazine</b></center><br>Aimed at young women and teenage girls, the pages are filled with images of beautiful people and detail the latest trends in makeup, hair and fashion from all over the world!'
 $item_info['compmag'] = '<center><b>Computer magazine</b></center><br>While most of the articles contain interesting and helpful info regarding computers and other tech, there are still advertisements slipped in trying to sell you on some pricey equipment you &quot;absolutely need to buy&quot;.'

locations/autotraidF.qsrc

@@ -100,6 +100,12 @@ if $ARGS[0] = 'car':
 	act 'Return': killvar 'carT' & killvar 'bupay' & gt 'autotraidF', 'start'
 	
 	if hour <= 17:
+		if car = 0 or car > 199:
+			!! this is a VERY crude fix for when car[] was created before car
+			!! if we ever add cars with indices past 199 its gonna break
+			killvar 'car'
+			car = 0
+		end
 		act 'Inspect a 2107':gt 'autotraidF', 'inspect', '2107', 1, 200, 1, 3
 
 		act 'Inspect another 2107 (Broken Engine)':
@@ -108,26 +114,31 @@ if $ARGS[0] = 'car':
 			menu_off = 1
 			'<center><b>2107 (Broken engine)</b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/car.jpg"></center>'
-			bupay = rand(10000, 50000)
-			'The car is basically a wreck. It doesn''t even start. When you ask the salesman how much it costs, he tells you "<<bupay>> <b>₽</b>" without hesitation.'
+			!! caching offers, resets on monday (via cikl)
+			if used_car['wrek_condition'] = 0 and used_car['wrek_price'] = 0:
+				used_car['wrek_condition'] = rand(10, 200)
+				used_car['wrek_price'] = rand(10000, 50000)
+			end
+			'The car is basically a wreck. It doesn''t even start. When you ask the salesman how much it costs, he tells you "<<used_car[''wrek_price'']>> <b>₽</b>" without hesitation.'
 
 			act 'Look around some more':gt 'autotraidf', 'car'
 
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy it for <<bupay>><b>₽</b>':
+			if car = 0 and prava = 1 and money >= used_car['wrek_price']:
+				act 'Buy it for <<used_car[''wrek_price'']>><b>₽</b>':
 					cla
-					money -= bupay
+					money -= used_car['wrek_price']
 					$car = '2107'
 					car = 1
 					benz = 3
 					cardrive = 9
 					car['new_condition'] = 200
-					car['current_condition'] = rand(10, car['new_condition'])
+					car['current_condition'] = used_car['wrek_condition']
 					wrek = 1
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash, and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<used_car[''wrek_price'']>> <b>₽</b> in cash, and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
 					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
-					killvar 'bupay'
+					gs 'shortgs', 'remove_array_element', 'used_car', 'wrek_condition'
+					gs 'shortgs', 'remove_array_element', 'used_car', 'wrek_price'
 					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
@@ -148,42 +159,52 @@ if $ARGS[0] = 'inspect':
 	menu_off = 1
 	$autotraidF_carname = $ARGS[1]
 	autotraidF_carnum = ARGS[2]
+	!! max potential condition, used in 'avt' to generate actual condition and price
 	car['potential_new_condition'] = ARGS[3]
-	carT = ARGS[4]
 	autotraidF_benz = ARGS[5]
 
 	'<center><b><<$autotraidF_carname>></b></center>'
+	!! currently theres no car1.jpg, only car.jpg, either we need logic (which was removed btw)
+	!! or we need an actual car1.jpg image
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/car<<autotraidF_carnum>>.jpg"></center>'
 
-	gs 'avt'
-	'<<$car[''potential_current_condition'']>> The car salesman wants <<bupay>> <b>₽</b> for it.'
+	!! caching offers, resets on monday (via cikl)
+	if used_car['<<autotraidF_carnum>>_condition'] = 0 and used_car['<<autotraidF_carnum>>_price'] = 0:
+		!! used in 'avt' as branching selector, affects price
+		carT = ARGS[4]
+		!! generates condition and price for the car
+		gs 'avt'
+	end
+	'<<$car[''potential_current_condition'']>> The car salesman wants <<used_car[''<<autotraidF_carnum>>_price'']>> <b>₽</b> for it.'
 
 	act 'Look around some more':
-		killvar 'bupay'
 		killvar '$autotraidF_carname'
 		killvar 'autotraidF_carnum'
 		killvar 'autotraidF_benz'
 		gt 'autotraidF', 'car'
 	end
 
-	if car = 0 and prava = 1 and money >= bupay:
-		act 'Buy (<<bupay>> <b>₽</b>)':
+	if car = 0 and prava = 1 and money >= used_car['<<autotraidF_carnum>>_price']:
+		act 'Buy (<<used_car[''<<autotraidF_carnum>>_price'']>> <b>₽</b>)':
 			cla
-			money -= bupay
+			money -= used_car['<<autotraidF_carnum>>_price']
 			$car = $autotraidF_carname
 			car = autotraidF_carnum
-			!!benz = fuel
+			!!benz means fuel
 			benz = autotraidF_benz
 			cardrive = 9
-			car['current_condition'] = car['potential_current_condition']
+			car['current_condition'] = used_car['<<autotraidF_carnum>>_condition']
+			!! sets condition when new (ie max possible condition)
 			car['new_condition'] = car['potential_new_condition']
 			wrek = 0
-			'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash, and the car is yours.' 
+			'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<used_car[''<<autotraidF_carnum>>_price'']>> <b>₽</b> in cash, and the car is yours.' 
 			'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-			killvar 'bupay'
 			killvar '$autotraidF_carname'
 			killvar 'autotraidF_carnum'
 			killvar 'autotraidF_benz'
+			gs 'shortgs', 'remove_array_element', 'car', 'potential_new_condition'
+			gs 'shortgs', 'remove_array_element', 'used_car', '<<autotraidF_carnum>>_condition'
+			gs 'shortgs', 'remove_array_element', 'used_car', '<<autotraidF_carnum>>_price'
 			act 'Leave': minut += 5 & gt 'city_industrial'
 		end
 	end

locations/avt.qsrc

@@ -1,7 +1,9 @@
 # avt
+tehNT = car['potential_new_condition']
 if tehNT = 0: tehNT = 200
 tehT = rand(10, tehNT)
 
+!! i could replace all tehT and tehNT with appropriate car[] variables but then the code gets even less readable
 if tehT >= tehNT * 75 / 100:$tehT = 'The car looks like it''s in excellent condition.'
 if tehT < tehNT * 75 / 100 and tehT >= tehNT * 50 / 100:$tehT = 'When you turn on the car, the engine makes some noise.'
 if tehT < tehNT * 50 / 100 and tehT >= tehNT * 25 / 100:$tehT = 'When you turn on the car, the engine rumbles and smokes.'
@@ -18,6 +20,13 @@ elseif carT = 2:
 	if tehT < tehNT * 50 / 100 and tehT >= tehNT * 25 / 100:bupay = rand(30000, 60000)
 	if tehT < tehNT * 25 / 100:bupay = rand(15000, 40000)
 end
+
+used_car['<<autotraidF_carnum>>_condition'] = tehT
+used_car['<<autotraidF_carnum>>_price'] = bupay
+
+killvar 'bupay'
+killvar 'tehNT'
+killvar 'tehT'
 killvar 'carT'
 
 --- avt ---------------------------------

locations/avtonorm.qsrc

@@ -18,7 +18,7 @@ if wrek = 0:
 	normrem = normneed * normhour
 elseif wrek = 1:
 	normneed = 0 - (car['current_condition'] - car['new_condition'])
-	normremK = (normneed * normhour) * 8
+	normrem = (normneed * normhour) * 8
 end
 
 --- avtonorm ---------------------------------

locations/cikl.qsrc

@@ -1206,6 +1206,8 @@ gs 'homes_properties', 'progress_property_rent_time'
 !!------------- Check for Daily Events for event generator, sets evt_chk variable  ------------------------------------------
 gs 'emp_functions', 'evt_day_chk'
 
+!!------------- Reset used car dealership offers  ------------------------------------------
+if week = 1 and used_car ! 0: killvar 'used_car'
 
 --- cikl ---------------------------------
 

locations/city_house_res_kitch.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'kitch':
 		if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
 
 		'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
-	elseif edaD = 0 and eda = 0:
+	elseif mc_inventory['food_diet'] = 0 and mc_inventory['food_basic'] = 0:
 		'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
 	end
 
@@ -72,7 +72,6 @@ if $ARGS[0] = 'kitch':
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
-	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

locations/city_mansion_residence_1.qsrc

@@ -198,7 +198,7 @@ if $ARGS[0] = 'ykitchen':
 			if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
 
 			'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
-		elseif edaD = 0 and eda = 0:
+		elseif mc_inventory['food_diet'] = 0 and mc_inventory['food_basic'] = 0:
 			'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
 		end
 
@@ -230,7 +230,7 @@ if $ARGS[0] = 'ykitchen':
 		dynamic $dritea
 		dynamic $fill_bottle
 		dynamic $edaD
-		dynamic $pranik
+		dynamic $mc_inventory['food_biscuits']
 		dynamic $fatdel
 		dynamic $lekarstvo
 		dynamic $vitamin

locations/dachain.qsrc

@@ -105,7 +105,7 @@ if $args[0] = 'dachakit':
 		if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
 
 		'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
-	elseif edaD = 0 and eda = 0:
+	elseif mc_inventory['food_diet'] = 0 and mc_inventory['food_basic'] = 0:
 		'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
 	end
 	
@@ -137,7 +137,6 @@ if $args[0] = 'dachakit':
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
-	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

locations/din_bad.qsrc

@@ -157,11 +157,11 @@ if $ARGS[0] = 'd_bag':
 		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
 	end
 	if pcs_hairlng > 80 and mc_inventory['scrunchies'] >= 1 and hbraids = 0:
-		if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''din_bad'', ''d_bag''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
+		if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''din_bad'', ''d_bag''">ponytail</a>. You have <<mc_inventory[''scrunchies'']>> scrunchies left.'
 		if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''din_bad'', ''d_bag''">scrunchie</a> to get rid of the ponytail.'
 	end
 	if pcs_hairlng > 80 and pcs_hairlng <= 400 and mc_inventory['kirbygrips'] >= 1 and hbraids = 0:
-		if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''din_bad'', ''d_bag''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
+		if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''din_bad'', ''d_bag''">updo your hair</a>. You have <<mc_inventory[''kirbygrips'']>> hair accessories at your disposal.'
 		if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''din_bad'', ''d_bag''">flow free</a>.'
 	end
 	if pcs_hairlng > 80 and pcs_hairlng <= 800 and mc_inventory['scrunchies'] >= 2 and hbraids = 0:
@@ -233,7 +233,7 @@ if $ARGS[0] = 'd_bag':
 		'You carry your sports water bottle in your purse. It''s empty.'
 	end
 	if bottle > 0: 'There''s a bottle of water in your purse. <a href="exec:bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	if buterbrod > 0: 'There''s a sandwich in your purse. <a href="exec:buterbrod = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Eat</a>'
+	if mc_inventory['food_sandwich'] > 0: 'There''s a sandwich in your purse. <a href="exec:mc_inventory['food_sandwich'] = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Eat</a>'
 	if strapon = 1 and strapnumber = 0:
 		'You have a strapon harness in your purse, but you don''t have a dildo attached to it'+iif(dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0, '. You keep your dildos in your desk at home.', ', because you don''t own one.')
 	elseif strapon = 1 and strapnumber ! 0:

locations/dom_gor.qsrc

@@ -94,14 +94,14 @@ if hour < 23:
 end
 
 if eda > 0:'In the refrigerator food is stored that''s good for <b><<eda>></b> servings.'
-if edaD = 0 and eda = 0:'<b><font color="red">The fridge is empty, nothing to eat in sight.</font></b>'
-if edaD > 0:'The refrigerator contains healthy meals that are good for <b><<edaD>></b> servings.'
+if mc_inventory['food_diet'] = 0 and mc_inventory['food_basic'] = 0:'<b><font color="red">The fridge is empty, nothing to eat in sight.</font></b>'
+if mc_inventory['food_diet'] > 0:'The refrigerator contains healthy meals that are good for <b><<mc_inventory['food_diet']>></b> servings.'
 
 if eda >= 1:
 	act 'Prepare meals (2:00)':
 		cla
 		*clr
-		eda -= 1
+		mc_inventory['food_basic'] -= 1
 		minut += 120
 		frost = 0
 		edahot = 0
@@ -135,7 +135,7 @@ if eda >= 1:
 	end
 end
 
-if edaD > 0:
+if mc_inventory['food_diet'] > 0:
 	act 'Eat diet food (0:30)':
 		cla
 		*clr
@@ -143,7 +143,7 @@ if edaD > 0:
 		minut += 30
 		pcs_health += 10
 		pcs_mood += 20
-		edaD -= 1
+		mc_inventory['food_diet'] -= 1
 		'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
 		if pcs_energy >= 100:
 			'You can no longer eat... For now at least.'

locations/gadhouse.qsrc

@@ -453,7 +453,6 @@ if $ARGS[0] = 'main':
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
-	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

locations/gadmarket.qsrc

@@ -20,7 +20,7 @@ frost = 0
 *nl
 
 $gadmarkettab = '<center><table align="center">'
-$gadmarkettab += FUNC ('$stock_item', 10, 'Package of tea biscuits', 400, 'pranik', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 10, 'Package of tea biscuits', 400, 'mc_inventory['food_biscuits']', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 20, 'Cigarettes', 150, 'siga', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Fashion magazine', 145, 'fashmag', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Computer magazine', 145, 'compmag', 'gadmarket')
@@ -29,11 +29,11 @@ $gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 145, 'cookma
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Knitting magazine', 145, 'knitmag', 'gadmarket')
 if preziktype = 0: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezik', 'gadmarket')
 if preziktype = 1 or preziktype = 2: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezikcount', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'tampon', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 25, 'Razors (number of shaves)', 350, 'stanok', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 30, 'Shampoo', 250, 'shampoo', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'mc_inventory[''tampons'']', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 25, 'Razors (number of shaves)', 350, 'mc_inventory[''razor'']', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 30, 'Shampoo', 250, 'mc_inventory[''shampoo'']', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'mc_inventory['food_sandwich']', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
 $gadmarkettab += '</table></center>'

locations/gas_station_gp_117.qsrc

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

locations/grandpahelp.qsrc

@@ -260,7 +260,7 @@ if $ARGS[0] = 'grazecows':
 		pcs_health += 10
 		minut += 40
 		if bottle = 0: bottle = 1
-		if buterbrod = 0: buterbrod = 1
+		if mc_inventory['food_sandwich'] = 0: mc_inventory['food_sandwich'] = 1
 		gs'stat'
 
 		act 'Continue':gt'gadfield','cow'

locations/intro_city_select.qsrc

@@ -1487,7 +1487,7 @@ if $ARGS[0] = 'sg_settings':
 	gs 'homes_properties', 'block_access', 'city_apartment'
 	cltarelka = 0
 	fairy = 0
-	eda = 0
+	mc_inventory['food_basic'] = 0
 	poroshok = 0
 	mc_inventory['shampoo'] =  0
 

locations/intro_customization.qsrc

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

locations/intro_sg_select.qsrc

@@ -1668,7 +1668,7 @@ if $ARGS[0] = 'sg_settings':
 	gs 'homes_properties', 'block_access', 'city_apartment'
 	cltarelka = 0
 	fairy = 0
-	eda = 0
+	mc_inventory['food_basic'] = 0
 	poroshok = 0
 	mc_inventory['shampoo'] =  0
 

locations/item_stock_db.qsrc

@@ -30,11 +30,11 @@ if $ARGS[0] = 'beauty':
     !! 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'
+    quantity_curr_aisle['<<item_idx>>'] = 50
 	!! maximum that Sveta can own - 0 for unlimited
-	max_curr_aisle['<<item_idx>>'] = '0'
+	max_curr_aisle['<<item_idx>>'] = 0
     !! Item price
-    cost_curr_aisle['<<item_idx>>'] = '1300'
+    cost_curr_aisle['<<item_idx>>'] = 1300
     !! Path to product image - if set
     $img_curr_aisle['<<item_idx>>'] = ''
 
@@ -43,9 +43,9 @@ if $ARGS[0] = 'beauty':
     $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'
+    quantity_curr_aisle['<<item_idx>>'] = 30
+	max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 2100
     $img_curr_aisle['<<item_idx>>'] = ''
 
 
@@ -53,146 +53,203 @@ if $ARGS[0] = 'beauty':
     $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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    quantity_curr_aisle['<<item_idx>>'] = 1 
+	max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 1150
     $img_curr_aisle['<<item_idx>>'] = ''
 end
 
+if $ARGS[0] = 'food':
+    item_idx = 1
+    $item_curr_aisle['<<item_idx>>'] = 'Regular food' 
+    $var_curr_aisle['<<item_idx>>'] = 'food_basic'
+    $desc_curr_aisle['<<item_idx>>'] = 'Basic food, might be nourishing.'
+    quantity_curr_aisle['<<item_idx>>'] = 1
+    max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 80
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 2
+    $item_curr_aisle['<<item_idx>>'] = 'Diet food' 
+    $var_curr_aisle['<<item_idx>>'] = 'food_diet'
+    $desc_curr_aisle['<<item_idx>>'] = 'Special diet food to help you lose weight.'
+    quantity_curr_aisle['<<item_idx>>'] = 1
+    max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 80
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 3
+    $item_curr_aisle['<<item_idx>>'] = 'Tea biscuits' 
+    $var_curr_aisle['<<item_idx>>'] = 'food_biscuits'
+    $desc_curr_aisle['<<item_idx>>'] = 'A packet of biscuits to accompany your favourite beverage.'
+    quantity_curr_aisle['<<item_idx>>'] = 10
+    max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 400
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 4
+    $item_curr_aisle['<<item_idx>>'] = 'Bottle of water' 
+    $var_curr_aisle['<<item_idx>>'] = 'food_water'
+    $desc_curr_aisle['<<item_idx>>'] = 'A bottle of water to quench your thirst.'
+    quantity_curr_aisle['<<item_idx>>'] = 1
+    max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 100
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 5
+    $item_curr_aisle['<<item_idx>>'] = 'Sandwich' 
+    $var_curr_aisle['<<item_idx>>'] = 'food_sandwich'
+    $desc_curr_aisle['<<item_idx>>'] = 'A sandwich to fill those hunger cravings.'
+    quantity_curr_aisle['<<item_idx>>'] = 1
+    max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 100
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 6
+    $item_curr_aisle['<<item_idx>>'] = 'Bottle of wine' 
+    $var_curr_aisle['<<item_idx>>'] = 'food_wine'
+    $desc_curr_aisle['<<item_idx>>'] = 'A cheap bottle of wine.'
+    quantity_curr_aisle['<<item_idx>>'] = 1
+    max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 200
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+end
+
 --- item_stock_db ---------------------------------
 

locations/kit_din.qsrc

@@ -396,7 +396,7 @@ $edagotpk = {
 		minut += 25
 	end
 	edahot += 1
-	eda -= 1
+	mc_inventory['food_basic'] -= 1
 	kuhdrova = 0
 	musor += 1
 	if $loc ! 'uni_dorm': cltarelka -= 1
@@ -447,18 +447,17 @@ $edasnack = {
 	act 'Have a snack (0:05)': gs 'food', 'snack'
 }
 
-$pranik = {
-	if pranik > 0:
-		if pranik = 1:
+	if mc_inventory['food_biscuits'] > 0:
+		if mc_inventory['food_biscuits'] = 1:
 			'You only have one more portion of tea biscuits.'
 		else
-			'You have enough tea biscuits for <b><<pranik>></b> more snacks.'
+			'You have enough tea biscuits for <b><<mc_inventory['food_biscuits']>></b> more snacks.'
 		end
 		act 'Eat some tea biscuits (0:05)':
 			*clr & cla
 			menu_off = 1
 			minut += 5
-			pranik -= 1
+			mc_inventory['food_biscuits'] -= 1
 			pcs_health += 30
 			pcs_mood += 20
 			pcs_energy += 20
@@ -478,7 +477,7 @@ $dritea = {
 }
 
 $edaD = {
-	if edaD > 0:
+	if mc_inventory['food_diet'] > 0:
 		'The refrigerator contains <b><<edaD>></b> healthy meals.'
 		act 'Eat diet food (0:20)':
 			*clr & cla
@@ -487,7 +486,7 @@ $edaD = {
 			minut += 20
 			pcs_health += 10
 			pcs_mood += 20
-			edaD -= 1
+			mc_inventory['food_diet'] -= 1
 			'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
 			if pcs_energy >= 100:
 				'You prepare a diet meal and try to eat it, but you''re really not hungry at all. You can''t finish the meal.'
@@ -544,10 +543,10 @@ $fill_bottle = {
 }
 
 $sandwich = {
-	if bag > 0 and buterbrod = 0: 
+	if bag > 0 and mc_inventory['food_sandwich'] = 0: 
 		act 'Make a sandwich to go (0:05)': 
 			minut += 5
-			buterbrod = 1
+			mc_inventory['food_sandwich'] = 1
 			gt $loc, $loc_arg
 		end
 	end

locations/kuhr.qsrc

@@ -60,7 +60,7 @@ if eda > 0:
 	if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
 
 	'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
-elseif edaD = 0 and eda = 0:
+elseif mc_inventory['food_diet'] = 0 and mc_inventory['food_basic'] = 0:
 	'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
 end
 
@@ -91,7 +91,6 @@ dynamic $driwater
 dynamic $dritea
 dynamic $fill_bottle
 dynamic $edaD
-dynamic $pranik
 dynamic $fatdel
 dynamic $lekarstvo
 dynamic $vitamin

locations/kuhr2x.qsrc

@@ -59,7 +59,7 @@ if eda > 0:
 	if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
 
 	'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
-elseif edaD = 0 and eda = 0:
+elseif mc_inventory['food_diet'] = 0 and mc_inventory['food_basic'] = 0:
 	'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
 end
 

locations/larek.qsrc

@@ -97,7 +97,7 @@ act 'Exit Department':gt'larek','start'
          act 'Buy tea biscuits (300 RUB)':
          cls
          money-=300
-         pranik+=10
+         mc_inventory['food_biscuits']+=10
          'You bought a bag of biscuits that go well with tea. You figure there''s about ten servings inside.'
          act 'Exit Department':gt'larek','food'
          end
@@ -111,11 +111,11 @@ act 'Exit Department':gt'larek','start'
          act 'Exit Department':gt'larek','food'
          end
      end
-     if money>=100 and buterbrod=0 and bag>0:
+     if money>=100 and mc_inventory['food_sandwich']=0 and bag>0:
          act 'Buy a sandwich (100 RUB)':
          cls
          money-=100
-         buterbrod=1
+         mc_inventory['food_sandwich']=1
          'You bought a sandwich and put it in your purse.'
          act 'Exit Department':gt'larek','food'
          end

locations/mirror.qsrc

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

locations/office.qsrc

@@ -177,11 +177,11 @@ if $ARGS[0] = 'break_room':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/breakroom.jpg"></center>'
 	'The break room is neat and clean and features a large table in the middle of the room flanked by a couch along one wall with a few comfortable chairs. A set of cabinets, a sink, some appliances and a fridge to store your lunch, if you happen to bring one, are set along the far wall.'
 	dynamic $driwater
-	if buterbrod > 0 and hour = 12:
+	if mc_inventory['food_sandwich'] > 0 and hour = 12:
 		act 'Eat your lunch':
 			*clr & cla
 			minut += 20
-			buterbrod = 0
+			mc_inventory['food_sandwich'] = 0
 			pcs_energy += 40
 			cumspclnt = 2
 			gs 'cum_cleanup'

locations/pav_pharmacy.qsrc

@@ -83,7 +83,7 @@ if $ARGS[0] = 'start':
 		*P func ('$stock_item', 50, 'Painkillers', 435, 'painkiller', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 10, 'Ointments for chafing', 372, 'mosolmaz', 'pav_pharmacy', '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', 30, 'Lip balm', 127, 'mc_inventory[''lipbalm'']', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', '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')
@@ -113,7 +113,7 @@ if $ARGS[0] = 'start':
 		*P func ('$stock_item', 50, 'Painkillers', 435, 'painkiller', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 10, 'Ointments for chafing', 372, 'mosolmaz', 'pav_pharmacy', 'ointment')
 		*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', 30, 'Lip balm', 127, 'mc_inventory[''lipbalm'']', 'pav_pharmacy', 'start')
 		*P func ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', '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')

locations/pav_shared_apt.qsrc

@@ -644,7 +644,7 @@ if $ARGS[0] = 'kitchen':
 		'In the refrigerator there''s enough (your own) food for <b><<eda>></b> servings. <<$edagot>>'
 	end
 	if edahot > 0:'<a href="exec: dynamic $edahotd ">On the table is ready meal (0:30).</a>'
-	if edaD = 0 and eda = 0:'<b><font color="red">You have nothing to eat, the refrigerator is empty!</font></b>'
+	if mc_inventory['food_diet'] = 0 and mc_inventory['food_basic'] = 0:'<b><font color="red">You have nothing to eat, the refrigerator is empty!</font></b>'
 
 	if hour = 6 or hour = 18:'<a href="exec: gt ''pav_shared_apt'', ''cookForGuys''">Cook meals for the guys (1:30)</a>'
 	

locations/pav_shared_gp.qsrc

@@ -226,8 +226,8 @@ end
 
 if $ARGS[0] = 'gpServe':
 	menu_off = 1
-	$boy = $gp_name
-	gs 'npcgeneratec', 0, $boy, 23
+	$gp_name = $gp_name
+	gs 'npcgeneratec', 0, $gp_name, 23
 	gs 'boyStat', $npclastgenerated
 	minut += 2
 	$loc_arg = 'gpServe'
@@ -398,7 +398,7 @@ if $ARGS[0] = 'gpHandjob':
 			'Your attempt is successful, as <<$gp_name>> cums right onto your hands and squirts all around them.'
 			gp_lastCum = daystart
 			gp_served = 1
-			gs 'cum_call', 'hands', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', 'hands', $gp_name, 1, 0, gp_cumVol
 			act 'Get up':step = 9 & gp_cumVol = 0 & gt 'pav_shared_gp', 'gpHandjob'
 		else
 			failC += 1
@@ -607,8 +607,8 @@ if $ARGS[0] = 'gpSuck':
 			'Your attempt is successful, as <<$gp_name>> cums right into your mouth and on your face.'
 			gp_lastCum = daystart
 			gp_served = 1
-			gs 'cum_call', 'mouth', $boy, 1, 0, gp_cumVol / 2
-			gs 'cum_call', 'face', $boy, 1, 0, gp_cumVol / 2
+			gs 'cum_call', 'mouth', $gp_name, 1, 0, gp_cumVol / 2
+			gs 'cum_call', 'face', $gp_name, 1, 0, gp_cumVol / 2
 			act 'Get up':step = 10 & gp_cumVol = 0 & gt 'pav_shared_gp', 'gpSuck'
 		else
 			failC += 1
@@ -939,7 +939,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			gp_vagCumInside += 1
 			gp_cumVag += gp_cumVol
 			gp_lastCum = daystart
-			gs 'cum_call', '', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', '', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'vaginal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -953,7 +953,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			'A large pool of cum lands on your abdomen, feeling warm but sticky.'
 			minut += 2
 			gp_lastCum = daystart
-			gs 'cum_call', 'stomach', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', 'stomach', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':gp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -966,7 +966,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			'Both your asscheeks are covered in sticky, warm seed.'
 			minut += 2
 			gp_lastCum = daystart
-			gs 'cum_call', 'butt', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', 'butt', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':gp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -980,7 +980,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			'<font color=#<<$gp_font>>>"Oh yes, now that''s the right makeup for a girl!"</font>'
 			minut += 2
 			gp_lastCum = daystart
-			gs 'cum_call', 'face', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', 'face', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':gp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1005,7 +1005,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			gp_cumVag += gp_cumVol
 			gp_vagCumInside += 1
 			gp_vagCumInsideUnwanted += 1
-			gs 'cum_call', '', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', '', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1034,7 +1034,7 @@ if $ARGS[0] = 'gpSexVaginal':
 			gp_swall += 1
 			gp_rel += 1
 			minut += 5
-			gs 'cum_call', 'mouth', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', 'mouth', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':gp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1330,7 +1330,7 @@ if $ARGS[0] = 'gpSexAnal':
 			gp_analCumInside = 1
 			gp_lastCum = daystart
 			gp_cumAnal += gp_cumVol
-			gs 'cum_call', 'anus', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', 'anus', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'anal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1344,7 +1344,7 @@ if $ARGS[0] = 'gpSexAnal':
 			'A large pool of cum lands on your abdomen, feeling warm but sticky.'
 			minut += 2
 			gp_lastCum = daystart
-			gs 'cum_call', 'stomach', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', 'stomach', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':gp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1357,7 +1357,7 @@ if $ARGS[0] = 'gpSexAnal':
 			'Both your asscheeks are covered in sticky, warm seed.'
 			minut += 2
 			gp_lastCum = daystart
-			gs 'cum_call', 'butt', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', 'butt', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':gp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1392,7 +1392,7 @@ if $ARGS[0] = 'gpSexAnal':
 			gp_analCumInside += 1
 			gp_analCumInsideUnwanted += 1
 			gp_rel -= 3
-			gs 'cum_call', '', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', '', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'anal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1420,7 +1420,7 @@ if $ARGS[0] = 'gpSexAnal':
 			minut += 5
 			gp_lastCum = daystart
 			gp_cumSwall += gp_cumVol
-			gs 'cum_call', 'mouth', $boy, 1, 0, gp_cumVol
+			gs 'cum_call', 'mouth', $gp_name, 1, 0, gp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':gp_cumVol = 0 & gt 'pav_shared_apt', 'payService'

locations/pav_shared_nd.qsrc

@@ -266,8 +266,8 @@ end
 
 if $ARGS[0] = 'ndServe':
 	menu_off = 1
-	$boy = $nd_name
-	gs 'npcgeneratec', 0, $boy, 21
+	$nd_name = $nd_name
+	gs 'npcgeneratec', 0, $nd_name, 21
 	gs 'boyStat', $npclastgenerated
 	minut += 2
 	$loc_arg = 'ndServe'
@@ -465,8 +465,8 @@ if $ARGS[0] = 'ndSuckBellowTable':
 			'Your attempt is successful, as <<$nd_name>> cums right into your mouth and on your face.'
 			nd_lastCum = daystart
 			nd_served = 1
-			gs 'cum_call', 'mouth', $boy, 1, 0, nd_cumVol / 2
-			gs 'cum_call', 'face', $boy, 1, 0, nd_cumVol / 2
+			gs 'cum_call', 'mouth', $nd_name, 1, 0, nd_cumVol / 2
+			gs 'cum_call', 'face', $nd_name, 1, 0, nd_cumVol / 2
 			act 'Crawl out from the table':step = 9 & nd_cumVol = 0 & gt 'pav_shared_nd', 'ndSuckBellowTable'
 		else
 			failC += 1
@@ -701,8 +701,8 @@ if $ARGS[0] = 'ndSuck':
 			'Your attempt is successful, as <<$nd_name>> cums right into your mouth and on your face.'
 			nd_lastCum = daystart
 			nd_served = 1
-			gs 'cum_call', 'mouth', $boy, 1, 0, nd_cumVol / 2
-			gs 'cum_call', 'face', $boy, 1, 0, nd_cumVol / 2
+			gs 'cum_call', 'mouth', $nd_name, 1, 0, nd_cumVol / 2
+			gs 'cum_call', 'face', $nd_name, 1, 0, nd_cumVol / 2
 			act 'Get up':step = 10 & nd_cumVol = 0 & gt 'pav_shared_nd', 'ndSuck'
 		else
 			failC += 1
@@ -993,7 +993,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			nd_vagCumInside += 1
 			nd_cumVag += nd_cumVol
 			nd_lastCum = daystart
-			gs 'cum_call', '', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', '', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'vaginal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			'An extensive pool of cum lands on your abdomen, feeling warm but sticky.'
 			minut += 2
 			nd_lastCum = daystart
-			gs 'cum_call', 'stomach', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', 'stomach', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':nd_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1020,7 +1020,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			'Both your asscheeks are covered in sticky, warm seed.'
 			minut += 2
 			nd_lastCum = daystart
-			gs 'cum_call', 'butt', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', 'butt', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':nd_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1033,7 +1033,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			'The seed starts squirting, splashing your face with surprisingly strong force, leaking to your nose and eyes and hair...'
 			minut += 2
 			nd_lastCum = daystart
-			gs 'cum_call', 'face', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', 'face', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':nd_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1056,7 +1056,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			nd_cumVag += nd_cumVol
 			nd_vagCumInside += 1
 			nd_vagCumInsideUnwanted += 1
-			gs 'cum_call', '', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', '', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1082,7 +1082,7 @@ if $ARGS[0] = 'ndSexVaginal':
 			nd_swall += 1
 			nd_rel += 1
 			minut += 5
-			gs 'cum_call', 'mouth', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', 'mouth', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':nd_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1338,7 +1338,7 @@ if $ARGS[0] = 'ndSexAnal':
 			nd_analCumInside += 1
 			nd_lastCum = daystart
 			nd_cumAnal += nd_cumVol
-			gs 'cum_call', 'anus', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', 'anus', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'anal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1352,7 +1352,7 @@ if $ARGS[0] = 'ndSexAnal':
 			'An extensive pool of cum lands on your abdomen, feeling warm but sticky.'
 			minut += 2
 			nd_lastCum = daystart
-			gs 'cum_call', 'stomach', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', 'stomach', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':nd_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1365,7 +1365,7 @@ if $ARGS[0] = 'ndSexAnal':
 			'Both your asscheeks are covered in sticky, warm seed.'
 			minut += 2
 			nd_lastCum = daystart
-			gs 'cum_call', 'butt', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', 'butt', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':nd_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1398,7 +1398,7 @@ if $ARGS[0] = 'ndSexAnal':
 			nd_cumAnal += nd_cumVol
 			nd_rel -= 5
 			'You furiously get up from the bed, putting your clothes between your legs to catch the remainder of the cum, so it doesn''t spur on your legs and carpet.'
-			gs 'cum_call', 'anus', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', 'anus', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'anal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1424,7 +1424,7 @@ if $ARGS[0] = 'ndSexAnal':
 			minut += 5
 			nd_lastCum = daystart
 			nd_cumSwall += nd_cumVol
-			gs 'cum_call', 'mouth', $boy, 1, 0, nd_cumVol
+			gs 'cum_call', 'mouth', $nd_name, 1, 0, nd_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':nd_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -1579,7 +1579,7 @@ if $ARGS[0] = 'ndSexPiss':
 		nd_cumSwall += nd_cumVol
 		
 		gs 'arousal', 'anal', 2, 'humiliation'
-		gs 'cum_call', 'anus', $boy, 1, 0, nd_cumVol
+		gs 'cum_call', 'anus', $nd_name, 1, 0, nd_cumVol
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/analcreampie/analcum.jpg"></center>'
 		''
 		'<font color=#<<$nd_font>>>"The first delivery was made, now to the second one! Engage!"</font>'

locations/pav_shared_sp.qsrc

@@ -236,8 +236,8 @@ end
 
 if $ARGS[0] = 'spServe':
 	menu_off = 1
-	$boy = $sp_name
-	gs 'npcgeneratec', 0, $boy, 19
+	$sp_name = $sp_name
+	gs 'npcgeneratec', 0, $sp_name, 19
 	gs 'boyStat', $npclastgenerated
 	minut += 2
 	$loc_arg = 'spServe'
@@ -446,8 +446,8 @@ if $ARGS[0] = 'spSuck':
 			'Your attempt is successful, as <<$sp_name>> cums right into your mouth and on your face.'
 			sp_lastCum = daystart
 			sp_served = 1
-			gs 'cum_call', 'mouth', $boy, 1, 0, sp_cumVol / 2
-			gs 'cum_call', 'face', $boy, 1, 0, sp_cumVol / 2
+			gs 'cum_call', 'mouth', $sp_name, 1, 0, sp_cumVol / 2
+			gs 'cum_call', 'face', $sp_name, 1, 0, sp_cumVol / 2
 			act 'Get up':step = 10 & sp_cumVol = 0 & gt 'pav_shared_sp', 'spSuck'
 		else
 			failC += 1
@@ -679,7 +679,7 @@ if $ARGS[0] = 'spSexVaginal':
 			sp_vagCumInside += 1
 			sp_cumVag += sp_cumVol
 			sp_lastCum = daystart
-			gs 'cum_call', '', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', '', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'vaginal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -693,7 +693,7 @@ if $ARGS[0] = 'spSexVaginal':
 			'An extensive pool of cum lands on your abdomen, feeling warm but sticky.'
 			minut += 2
 			sp_lastCum = daystart
-			gs 'cum_call', 'stomach', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', 'stomach', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':sp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -706,7 +706,7 @@ if $ARGS[0] = 'spSexVaginal':
 			'Both your asscheeks are covered in sticky, warm seed.'
 			minut += 2
 			sp_lastCum = daystart
-			gs 'cum_call', 'butt', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', 'butt', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':sp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -719,7 +719,7 @@ if $ARGS[0] = 'spSexVaginal':
 			'The seed starts squirting, splashing your face with surprisingly strong force, leaking to your nose and eyes and hair...'
 			minut += 2
 			sp_lastCum = daystart
-			gs 'cum_call', 'face', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', 'face', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':sp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -742,7 +742,7 @@ if $ARGS[0] = 'spSexVaginal':
 			sp_cumVag += sp_cumVol
 			sp_vagCumInside += 1
 			sp_vagCumInsideUnwanted += 1
-			gs 'cum_call', '', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', '', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -768,7 +768,7 @@ if $ARGS[0] = 'spSexVaginal':
 			sp_swall += 1
 			sp_rel += 1
 			minut += 5
-			gs 'cum_call', 'mouth', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', 'mouth', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':sp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -930,7 +930,7 @@ if $ARGS[0] = 'spSexAnal':
 			sp_analCumInside += 1
 			sp_lastCum = daystart
 			sp_cumAnal += sp_cumVol
-			gs 'cum_call', 'anus', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', 'anus', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'anal', 2
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -944,7 +944,7 @@ if $ARGS[0] = 'spSexAnal':
 			'A small pool of cum lands on your abdomen, feeling warm but sticky.'
 			minut += 2
 			sp_lastCum = daystart
-			gs 'cum_call', 'stomach', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', 'stomach', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':sp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -957,7 +957,7 @@ if $ARGS[0] = 'spSexAnal':
 			'Both your asscheeks are covered in sticky, warm seed.'
 			minut += 2
 			sp_lastCum = daystart
-			gs 'cum_call', 'butt', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', 'butt', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':sp_cumVol = 0 & gt 'pav_shared_apt', 'payService'
@@ -991,7 +991,7 @@ if $ARGS[0] = 'spSexAnal':
 			sp_cumAnal += sp_cumVol
 			sp_rel -= 5
 			'You angrily get up from the bed, putting your clothes between your legs to catch the remainder of the cum, so it doesn''t spur on your legs and carpet.'
-			gs 'cum_call', 'anus', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', 'anus', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'anal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1016,7 +1016,7 @@ if $ARGS[0] = 'spSexAnal':
 			minut += 5
 			sp_lastCum = daystart
 			sp_cumSwall += sp_cumVol
-			gs 'cum_call', 'mouth', $boy, 1, 0, sp_cumVol
+			gs 'cum_call', 'mouth', $sp_name, 1, 0, sp_cumVol
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':sp_cumVol = 0 & gt 'pav_shared_apt', 'payService'

locations/pav_train_market.qsrc

@@ -137,7 +137,6 @@ if $ARGS[0] = 'start':
 				'"Yes, yes," the woman counters, "Nice swine, only 5 <b>₽</b>."'
 				*nl
 				'Just as you are about to give up, a young Chinese boy about your brother''s age arrives.'
-				'Just as you are about to give up, a young Chinese boy about your brother''s age arrives.'
 				'"My grandmother asks why you don''t like the piglets?" he translates as the old woman stops.'
 				'"I don''t want a pig," you reply in relief as his Russian is quite good, "I am looking for rice wine, wang-goo."'
 				'"Ah, huangjiu!" he exclaims as he turns to his grandmother and starts speaking in Chinese.'

locations/shop_photography.qsrc

@@ -23,17 +23,19 @@ if $ARGS[0] = 'start':
 	'<center><img src="images/locations/city/citycenter/mall/photoshop/shop.jpg"></center>'
 	'The shop is dedicated to cameras and is celebrating this fact by displaying a myriad of them along every wall. A singular counter sits just off the adjacent wall with the shopkeeper standing behind it, clearly eager for some trade to enter his shop.'
 
-	if photography_start = 1 and week >= 6:
+	if photography_start = 1 and week >= 6 and photography['datecheck'] ! daystart:
 		act 'Ask about work':		
 			*clr & cla
 			minut += 10
 			gs 'stat'
 			'<center><img src="images/locations/city/citycenter/mall/photoshop/owner.jpg"></center>'
 			if photography_start = 1:	
+
 				'You walk up to Branko. "Excuse me Branko, but you said you might have some work for me. Would you happen to have anything?"'
-				'He smiles at you. "Yes yes, I remember. You''re <<$pcs_nickname>>,  Let me check." He opens a laptop sitting on the counter next to him and taps on the keys before he looks up at you.'
+				'He smiles at you. "Yes yes, I remember. You''re <<$pcs_nickname>>, Let me check." He opens a laptop sitting on the counter next to him and taps on the keys before he looks up at you.'
 				
 				!! Init Job Array
+				photography['datecheck'] = daystart
 				gs 'photography_work', 'job_init'
 				gs 'emp_functions', 'disp_evt', 1
 				

locations/stat_display.qsrc

@@ -1073,11 +1073,11 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec:msg ''You are feeling a tingling sensation between your legs.''"><img title="You are feeling a bit aroused." height = <<set_siconht>> src="images/system/icons/status/arousal_low.png"></a></td>'
 	end
 
-	if cheatNoEat = 0 and $stat_hunger_msg ! '' and buterbrod = 0:
+	if cheatNoEat = 0 and $stat_hunger_msg ! '' and mc_inventory['food_sandwich'] = 0:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_hunger_msg"><img title="<<$stat_hunger_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
-	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and buterbrod = 1 and menu_off = 0:
-		$statusIconBarTab += '<td><a href="exec: buterbrod = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat''"><img title="Click to eat your sandwich." height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
-	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and buterbrod = 1 and menu_off = 1:
+	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and mc_inventory['food_sandwich'] = 1 and menu_off = 0:
+		$statusIconBarTab += '<td><a href="exec: mc_inventory['food_sandwich'] = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat''"><img title="Click to eat your sandwich." height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
+	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and mc_inventory['food_sandwich'] = 1 and menu_off = 1:
 		$statusIconBarTab += '<td><a href="exec: $stat_hunger_msg"><img title="Your sandwich has to wait until you can spare a minute." height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
 	end