[Fixed] Variables and added the city market to the new shop system

locations/Cheatmenu_din.qsrc

@@ -2981,11 +2981,11 @@ $cheatmenu['vartracker'] = {
 	'hypnoAddict: <<hypnoAddict>>'
 	'missCum: <<missCum>>'
 	if preziktype = 0:
-		'condoms: in use(normal)/damaged/bad condoms: <<mc_inventory[''equipped_condoms'']+mc_inventory[''normal_condoms''] >>/<<mc_inventory[''sabotaged_condoms'']>>/<<badprezik>>'
+		'condoms: in use(normal)/damaged/bad condoms: <<mc_inventory[''equipped_condoms'']+mc_inventory[''normal_condoms''] >>/<<mc_inventory[''sabotaged_condoms'']>>/<<mc_inventory[''bad_condoms'']>>'
 	elseif preziktype = 1:
-		'condoms: (Not in use) normal/damaged/bad condoms: <<mc_inventory[''normal_condoms'']>>/<<mc_inventory[''sabotaged_condoms'']>>/<<badprezik>>'
+		'condoms: (Not in use) normal/damaged/bad condoms: <<mc_inventory[''normal_condoms'']>>/<<mc_inventory[''sabotaged_condoms'']>>/<<mc_inventory[''bad_condoms'']>>'
 	else
-		'condoms: in use (damaged)/normal/bad condoms: <<mc_inventory[''equipped_condoms'']+mc_inventory[''sabotaged_condoms'']>>/<<mc_inventory[''normal_condoms'']>>/<<badprezik>>'
+		'condoms: in use (damaged)/normal/bad condoms: <<mc_inventory[''equipped_condoms'']+mc_inventory[''sabotaged_condoms'']>>/<<mc_inventory[''normal_condoms'']>>/<<mc_inventory[''bad_condoms'']>>'
 	end
 	if mc_inventory['contraceptive_pill'] > 0:
 		'pack(s) of birth control pills: <<mc_inventory[''contraceptive_pill'']>>'
@@ -3361,9 +3361,9 @@ $cheatmenu['items'] = {
 	if showPharmacyItems = 1:
 		'<a href = "exec: showPharmacyItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
 		*pl 'Morning after pill: <a href="exec:mc_inventory[''morning_after_pill'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''morning_after_pill'']>> </b></a>'
-		*pl 'Condoms: <a href="exec:prezik=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''equipped_condoms'']>> </b></a>'
+		*pl 'Condoms: <a href="exec:mc_inventory[''equipped_condoms'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''equipped_condoms'']>> </b></a>'
 		*pl 'Pregnancy test: <a href="exec:mc_inventory[''pregnancy_test'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''pregnancy_test'']>> </b></a>'
-		*pl 'Birth control pills: <a href="exec:tabletki=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''contraceptive_pill'']>> </b></a>'
+		*pl 'Birth control pills: <a href="exec:mc_inventory[''contraceptive_pill'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''contraceptive_pill'']>> </b></a>'
 		*pl 'Antibiotics: <a href="exec:mc_inventory[''antibiotics'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''antibiotics'']>> </b></a>'
 		*pl 'Vitamins: <a href="exec:mc_inventory[''vitamins'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''vitamins'']>> </b></a>'
 		*pl 'Painkillers: <a href="exec:mc_inventory[''painkillers'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''painkillers'']>> </b></a>'

locations/booty_call_stats.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'starting_stats':
 	booty_call['sweat'] = pcs_sweat
 	booty_call['orgasm'] = orgasm
 	booty_call['orgasm_limit'] = orgasm + 6
-	booty_call['pc_condom_count'] = prezik
+	booty_call['pc_condom_count'] = mc_inventory['equipped_condoms']
 	booty_call['start_time'] = totminut
 	if $start_type[1] ! 'nomagic': booty_call['magik'] = pcs_magik
 	if npc_fuckbuddy[$boy] ! 1: npc_fuckbuddy[$boy] = 1

locations/city_market.qsrc

@@ -21,11 +21,13 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 	mag = 1
 	$loc_arg = 'start'
 	$loc = 'city_market'
+	$loc_s = 'city_market'
+	$args_s = 'start'
 	$menu_loc = 'city_market'
 	$menu_arg = 'start'
 	
-	'<center><b><font color="maroon">Marketplace</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/market/rinok.jpg"></center>'
+	'<center><table><TR BGCOLOR="' + $bgcolor + '"><TD><b>Marketplace</b></TD></TR></table></center>'
+	$backimage= 'images/locations/city/residential/market/rinok.jpg'
 	''
 	'One of the stalls has a sign attached to it that reads "Cash paid for secondhand clothes". You can <a href="exec:cloc=2 & gt ''clothing'', ''view_clothing_list'', ''sell''">sell individual items</a> or <a href="exec:gs ''portnoi''">all of your unwanted clothes here</a>.'
 
@@ -35,16 +37,10 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 	else
 		''
 	end
-	*pl '<center><table align="center" width=80%>'
-	*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, '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 
+	gs 'item_cart', 'shoppping_aisle', 'market'
+	gs 'stat'
+	gs 'themes', 'outdoors'
 	*pl
 	if analplugIN = 1 and $pantyworntype = 'none' and PCloSkirt > 2:
 		nurand = rand(0, 100)
@@ -60,6 +56,7 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 	end
 
 	act 'Leave':
+		$backimage= ''
 		cla
 		minut += 5
 		$loc_arg = ''
@@ -86,6 +83,7 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 			end
 		end
 		act 'Quit':
+			$backimage= ''
 			cla
 			work = 0
 			workrin = 0
@@ -100,6 +98,7 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 		'A messily written ad hangs from one of the stalls. "Need female market stall staff. Paychecks big."'
 
 		act 'Approach the owner of the ad':
+			$backimage= ''
 			cla
 			*clr
 			'Hi, my name is Arthur. I own many stalls here and I need a saleswoman. Want the job?'
@@ -121,6 +120,7 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 	end
 
 	act 'Go to the book tray':
+		$backimage= ''
 		cls
 		minut += 15
 		gs'stat'
@@ -182,6 +182,7 @@ end
 if $ARGS[0] = 'clo':
 	$loc_arg = 'clo'
 	$loc = 'city_market'
+	$backimage= ''
 	cls
 	gs'stat'
 	gs 'themes', 'indoors'
@@ -223,6 +224,7 @@ if $ARGS[0] = 'clo':
 end
 
 if $ARGS[0] = 'marketclo':
+	$backimage= ''
 	cla
 
 	if market_outfits[i] ! 0:
@@ -237,6 +239,7 @@ end
 if $ARGS[0] = 'tailor':
 	CLOSE ALL
 	cls
+	$backimage= ''
 	$loc = 'city_market'
 	$loc_arg = 'tailor'
 	$menu_loc = 'city_market'

locations/dinSex.qsrc

@@ -180,12 +180,12 @@ end
 ! "deal_with_condom" procedure should be replacement of "sexstart" dynamic procedure
 !! gs 'dinsex', 'boy_puts_condom'
 if $ARGS[0] = 'boy_puts_condom':
-	protect = iif(prezik > 0,1,0)
+	protect = iif(mc_inventory['equipped_condoms'] > 0,1,0)
 	if $ARGS[1] = '':
 		! do you have condoms?
 		if mc_inventory['equipped_condoms'] > 0:
-			if rand(1,prezik) <= badprezik: 
-				badprezik -= 1
+			if rand(1,mc_inventory['equipped_condoms']) <= mc_inventory['bad_condoms']: 
+				mc_inventory['bad_condoms'] -= 1
 				noprotect = 1
 				sexcontra = 7
 				*p '<<ucase(mid($boydesc,1,1))>><<mid($boydesc,2,len($boydesc)-1)>> takes your '+iif(preziktype = 2,'sabotaged ','')+ 'condom and puts it on <<$xyr>> <<dick>> centimeter dick.'
@@ -194,7 +194,7 @@ if $ARGS[0] = 'boy_puts_condom':
 				*p '<<ucase(mid($boydesc,1,1))>><<mid($boydesc,2,len($boydesc)-1)>> takes your condom and puts it on <<$xyr>> <<dick>> centimeter dick.'
 				noprotect = 0
 			end
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			sexcontra = iif(preziktype = 2,7,sexcontra) 
 		else
 			sexcontra = 0
@@ -205,15 +205,15 @@ if $ARGS[0] = 'boy_puts_condom':
 		*p '<<$custmsg>>'
 		! do you have condoms?
 		if mc_inventory['equipped_condoms'] > 0:
-			if rand(1,prezik) <= badprezik: 
-				badprezik -= 1
+			if rand(1,mc_inventory['equipped_condoms']) <= mc_inventory['bad_condoms']: 
+				mc_inventory['bad_condoms'] -= 1
 				noprotect = 1
 				sexcontra = 7
 			else
 				sexcontra = 3
 				noprotect = 0
 			end
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			sexcontra = iif(preziktype = 2,7,sexcontra) 
 		else
 			sexcontra = 0
@@ -233,12 +233,12 @@ end &! --- boy_puts_his_condom ---
 
 !! gs 'dinsex', 'pc_puts_condom'
 if $ARGS[0] = 'pc_puts_condom':
-	protect = iif(prezik > 0,1,0)
+	protect = iif(mc_inventory['equipped_condoms'] > 0,1,0)
 	if $ARGS[1] = '':
 		! do you have condoms?
 		if mc_inventory['equipped_condoms'] > 0:
-			if rand(1,prezik) <= badprezik: 
-				badprezik -= 1
+			if rand(1,mc_inventory['equipped_condoms']) <= mc_inventory['bad_condoms']: 
+				mc_inventory['bad_condoms'] -= 1
 				noprotect = 1
 				sexcontra = 7
 				*p 'You take your '+iif(preziktype = 2,'sabotaged ','')+ 'condom and put it on <<$xyr>> <<dick>> centimeter dick.'
@@ -247,7 +247,7 @@ if $ARGS[0] = 'pc_puts_condom':
 				*p 'You take your condom and put it on <<$xyr>> <<dick>> centimeter dick.'
 				noprotect = 0
 			end
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			sexcontra = iif(preziktype = 2,7,sexcontra) 
 		else
 			sexcontra = 0
@@ -258,15 +258,15 @@ if $ARGS[0] = 'pc_puts_condom':
 		*p '<<$custmsg>>'
 		! do you have condoms?
 		if mc_inventory['equipped_condoms'] > 0:
-			if rand(1,prezik) <= badprezik: 
-				badprezik -= 1
+			if rand(1,mc_inventory['equipped_condoms']) <= mc_inventory['bad_condoms']: 
+				mc_inventory['bad_condoms'] -= 1
 				noprotect = 1
 				sexcontra = 7
 			else
 				sexcontra = 3
 				noprotect = 0
 			end
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			sexcontra = iif(preziktype = 2,7,sexcontra) 
 		else
 			sexcontra = 0

locations/din_bad.qsrc

@@ -172,7 +172,7 @@ if $ARGS[0] = 'd_bag':
 	*nl
 	if mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 		if preziktype = 2 or mc_inventory['sabotaged_condoms'] > 0:
-			'You have <b><<iif(preziktype = 2, mc_inventory[''normal_condoms''], mc_inventory[''normal_condoms'']+mc_inventory[''equipped_condoms''])>></b> normal condoms left, and <b><<iif(preziktype = 2, mc_inventory[''equipped_condoms'']+mc_inventory['sabotaged_condoms'], mc_inventory['sabotaged_condoms'])>></b> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu">condoms left in your purse.</a>'
+			'You have <b><<iif(preziktype = 2, mc_inventory[''normal_condoms''], mc_inventory[''normal_condoms'']+mc_inventory[''equipped_condoms''])>></b> normal condoms left, and <b><<iif(preziktype = 2, mc_inventory[''equipped_condoms'']+mc_inventory[''sabotaged_condoms''], mc_inventory[''sabotaged_condoms''])>></b> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu">condoms left in your purse.</a>'
 		elseif preziktype < 2 and mc_inventory['sabotaged_condoms'] = 0:
 			'You have <b><<mc_inventory[''normal_condoms'']+mc_inventory[''equipped_condoms'']>></b> <a href="exec:dynamic $din_Switch_Condom_Menu">condoms left in your purse.</a>'
 		end
@@ -198,7 +198,7 @@ if $ARGS[0] = 'd_bag':
 	if joint > 0: 'You have enough weed for <b><<joint>></b> joints.'
 	if mc_inventory['contraceptive_pill'] > 0 and pillsleft[ptype] > 0:
 		'You have <b><<mc_inventory[''contraceptive_pill'']>></b> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <b><<pillsleft[ptype]>></b> pills left in your opened package.'
-	elseif tabletki	= 0 and pillsleft[ptype] > 0:
+	elseif mc_inventory['contraceptive_pill']	= 0 and pillsleft[ptype] > 0:
 		'You have <b><<pillsleft[ptype]>></b> <a href="exec:dynamic $d_tabletkied">birth control pills</a> left in your purse.'
 	elseif mc_inventory['contraceptive_pill'] > 0 and pillsleft[ptype] = 0:
 		'You have <b><<mc_inventory[''contraceptive_pill'']>></b> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> in your purse.'
@@ -284,7 +284,7 @@ $din_Switch_Condom_Menu = {
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	i = 0
-	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and <<iif(preziktype = 2, prezik+mc_inventory['sabotaged_condoms'], mc_inventory['sabotaged_condoms'])>> sabotaged condoms left.'
+	'You have <<iif(preziktype < 2, mc_inventory[''equipped_condoms'']+mc_inventory[''normal_condoms''], mc_inventory[''normal_condoms''])>> normal condoms left and <<iif(preziktype = 2, mc_inventory[''equipped_condoms'']+mc_inventory[''sabotaged_condoms''], mc_inventory[''sabotaged_condoms''])>> sabotaged condoms left.'
 	*nl
 	if preziktype > 0:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
@@ -310,7 +310,7 @@ $din_Table_Condom_Menu = {
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
 	*nl
 	i = 1
-	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and	<<iif(preziktype = 2, prezik+mc_inventory['sabotaged_condoms'], mc_inventory['sabotaged_condoms'])>> sabotaged condoms left.'
+	'You have <<iif(preziktype < 2, mc_inventory[''equipped_condoms'']+mc_inventory[''normal_condoms''], mc_inventory[''normal_condoms''])>> normal condoms left and	<<iif(preziktype = 2, mc_inventory[''equipped_condoms'']+mc_inventory[''sabotaged_condoms''], mc_inventory[''sabotaged_condoms''])>> sabotaged condoms left.'
 	*nl
 	if preziktype > 0:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
@@ -329,8 +329,8 @@ $din_Table_Condom_Menu = {
 }
 
 !! Condom System
-!! prezik: Total number of condoms sveta is using (normal or damaged).
-!! prezikcount: Number of normal condoms sveta isn''t using.
+!! mc_inventory['equipped_condoms']: Total number of condoms sveta is using (normal or damaged).
+!! mc_inventory['normal_condoms']: Number of normal condoms sveta isn''t using.
 !! mc_inventory['sabotaged_condoms']: Number of damaged condoms seveta isn''t using.
 !! preziktyp: 0 - Use condoms / 1 - don''t use condoms / 2 - use damaged condoms
 !! to check if sveta wants to use a condom use if mc_inventory['equipped_condoms'] > 0:
@@ -343,30 +343,30 @@ $din_Do_Condom_Counts = {
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	if ARGS[0] = 1:
 		'Use a condom the next time you have sex.'
-		if preziktype = 2: mc_inventory['sabotaged_condoms'] = prezik
-		prezik = prezikcount
-		prezikcount = 0
+		if preziktype = 2: mc_inventory['sabotaged_condoms'] = mc_inventory['equipped_condoms']
+		mc_inventory['equipped_condoms'] = mc_inventory['normal_condoms']
+		mc_inventory['normal_condoms'] = 0
 		preziktype = 0
 	elseif ARGS[0] = 2:
 		'You will not use a condom the next time you have sex.'
-		if preziktype = 0: mc_inventory['normal_condoms'] = prezik
-		if preziktype = 2: mc_inventory['sabotaged_condoms'] = prezik
-		prezik = 0
+		if preziktype = 0: mc_inventory['normal_condoms'] = mc_inventory['equipped_condoms']
+		if preziktype = 2: mc_inventory['sabotaged_condoms'] = mc_inventory['equipped_condoms']
+		mc_inventory['equipped_condoms'] = 0
 		preziktype = 1
 	elseif ARGS[0] = 3:
 		'Use your sabotaged condom the next time you have sex.'
-		if preziktype = 0: mc_inventory['normal_condoms'] = prezik
-		prezik = mc_inventory['sabotaged_condoms']
+		if preziktype = 0: mc_inventory['normal_condoms'] = mc_inventory['equipped_condoms']
+		mc_inventory['equipped_condoms'] = mc_inventory['sabotaged_condoms']
 		mc_inventory['sabotaged_condoms'] = 0
 		preziktype = 2
 	elseif ARGS[0] = 4:
 		if preziktype ! 0 and mc_inventory['normal_condoms'] > 0:
 			mc_inventory['sabotaged_condoms'] +=1
-			prezikcount -=1
+			mc_inventory['normal_condoms'] -=1
 			'You use a needle to punch holes in one of the condoms.'
 		elseif preziktype = 0 and mc_inventory['equipped_condoms'] > 0:
 			mc_inventory['sabotaged_condoms'] +=1
-			prezik -=1
+			mc_inventory['equipped_condoms'] -=1
 			'You use a needle to punch holes in one of the condoms.'
 		else
 			'You do not have any condoms to sabotage.'
@@ -384,35 +384,35 @@ $din_Update_Condom_Counts = {
 	if mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0: prezikmsg = 1
 	if preziktype = 0:
 		if mc_inventory['normal_condoms'] > 0:
-			prezik += prezikcount
-			prezikcount = 0
+			mc_inventory['equipped_condoms'] += mc_inventory['normal_condoms']
+			mc_inventory['normal_condoms'] = 0
 		end
 		if mc_inventory['equipped_condoms'] <= 0:
 			'You are out of condoms.'
-			prezik = 0
-			prezikcount = 0
+			mc_inventory['equipped_condoms'] = 0
+			mc_inventory['normal_condoms'] = 0
 			preziktype = 1
 		end
 	elseif preziktype = 1:
 		if mc_inventory['equipped_condoms'] > 0:
-			prezikcount += prezik
-			prezik = 0
+			mc_inventory['normal_condoms'] += mc_inventory['equipped_condoms']
+			mc_inventory['equipped_condoms'] = 0
 		end
 	elseif preziktype = 2:
 		if mc_inventory['sabotaged_condoms'] > 0:
-			prezik += mc_inventory['sabotaged_condoms']
+			mc_inventory['equipped_condoms'] += mc_inventory['sabotaged_condoms']
 			mc_inventory['sabotaged_condoms'] = 0
 		end
 		if mc_inventory['equipped_condoms'] <= 0 and mc_inventory['normal_condoms'] <= 0:
 			if prezikmsg = 1:prezikmsg = 2
-			prezik = 0
+			mc_inventory['equipped_condoms'] = 0
 			mc_inventory['sabotaged_condoms'] = 0
-			prezikcount = 0
+			mc_inventory['normal_condoms'] = 0
 			preziktype = 1
 		elseif mc_inventory['equipped_condoms'] <= 0 and mc_inventory['normal_condoms'] > 0:
 			'You have run out of sabotaged condoms so you will have to use normal condoms.'
-			prezik = prezikcount
-			prezikcount = 0
+			mc_inventory['equipped_condoms'] = mc_inventory['normal_condoms']
+			mc_inventory['normal_condoms'] = 0
 			preziktype = 0
 		end
 	end
@@ -427,9 +427,9 @@ $d_tabletkied = {
 	tabloc = 0
 	if tabletkiday < daystart and thinkpreg = 0 and knowpreg = 0: '<a href="exec:dynamic $d_tabletkieda, 1">Take the birth control pill now.</a>'
 	if tabletkicheck = 0 and thinkpreg = 0 and knowpreg = 0:
-		if (tabletki > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] = 0: 
+		if (mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] = 0: 
 			'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Set a reminder to take your birth control pills.</a>'
-		elseif (tabletki > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] > 0: 
+		elseif (mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] > 0: 
 			'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Change your birth control reminder.</a>'
 			'<a href="exec:gs ''din_bad'', ''turn_off_bc_reminder''">Turn off your birth control reminder.</a>'
 		end
@@ -461,9 +461,9 @@ $d_tabletkiedt = {
 	if tabletkiday < daystart and thinkpreg = 0 and knowpreg = 0: '<a href="exec:*clr & dynamic $d_tabletkieda, 1">Take the birth control pill now.</a>'
 	
 	if tabletkicheck = 0 and thinkpreg = 0 and knowpreg = 0:
-		if (tabletki > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] = 0: 
+		if (mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] = 0: 
 			'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Set a reminder to take your birth control pills.</a>'
-		elseif (tabletki > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] > 0: 
+		elseif (mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] > 0: 
 			'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Change your birth control reminder.</a>'
 			'<a href="exec:gs ''din_bad'', ''turn_off_bc_reminder''">Turn off your birth control reminder.</a>'
 		end
@@ -1044,34 +1044,34 @@ $use_bcream = {
 if $ARGS[0] = 'takepill':
 
 	if mc_inventory['contraceptive_pill'] > 0 and pillsleft[ptype] = 0:
-		tabletkirand = rand(1, tabletki)
+		tabletkirand = rand(1, mc_inventory['contraceptive_pill'])
 		if tabletkirand <= tabletkiold:
-			tabletki -=1
+			mc_inventory['contraceptive_pill'] -=1
 			tabletkiold -=1
 			ptype = 1
 			pillsleft[ptype] = 28
 		elseif tabletkirand <= tabletkiold + tabletkifake:
-			tabletki -=1
+			mc_inventory['contraceptive_pill'] -=1
 			tabletkifake -=1
 			ptype = 2
 			pillsleft[ptype] = 28
 		elseif tabletkirand <= tabletkiold + tabletkifake + tabletkirej:
-			tabletki -=1
+			mc_inventory['contraceptive_pill'] -=1
 			tabletkirej -=1
 			ptype = 3
 			pillsleft[ptype] = 28
 		elseif tabletkirand <= tabletkiold + tabletkifake + tabletkirej + tabletkisug:
-			tabletki -=1
+			mc_inventory['contraceptive_pill'] -=1
 			tabletkisug -=1
 			ptype = 4
 			pillsleft[ptype] = 28
 		elseif tabletkirand <= tabletkiold + tabletkifake + tabletkirej + tabletkisug + tabletkifert:
-			tabletki -=1
+			mc_inventory['contraceptive_pill'] -=1
 			tabletkifert -=1
 			ptype = 5
 			pillsleft[ptype] = 28
 		else
-			tabletki -=1
+			mc_inventory['contraceptive_pill'] -=1
 			ptype = 0
 			pillsleft[ptype] = 28
 		end

locations/dina.qsrc

@@ -187,14 +187,14 @@ $hypnoAddiction = {
 
 $prezik = {
 	if mc_inventory['equipped_condoms'] > 0:
-		if badprezik > 0:
-			if rand(1,prezik) <= badprezik: badprezik -= 1 & noprotect = 1
+		if mc_inventory['bad_condoms'] > 0:
+			if rand(1,mc_inventory['equipped_condoms']) <= mc_inventory['bad_condoms']: mc_inventory['bad_condoms'] -= 1 & noprotect = 1
 		else
 			noprotect = 0
 		end
-		prezik -= 1
+		mc_inventory['equipped_condoms'] -= 1
 	elseif mc_inventory['equipped_condoms'] < 0:
-		prezik = 0
+		mc_inventory['equipped_condoms'] = 0
 	end
 }
 

locations/fertility.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'birth_control':
 !!	tabletkicpd		: Current MC Pill Dicipline
 !!	tabletkichday	: Current day that the Birth Control is being evaluated for
 !!	tabletkicheck	: If the birth control from shot (2) or pill (1)
-!!	tabletki		: How many packages of Birth Control Pills there are
+!!	mc_inventory['contraceptive_pill']	: How many packages of Birth Control Pills there are
 !!	tabletkiold		: Total number packages of expired pills
 !!	tabletkifake	: Total number packages of fake/counterfeit pills
 !!	tabletkirej		: Total number packages of factory rejected pills

locations/furisex.qsrc

@@ -24,8 +24,8 @@ if ARGS[0] = 2:
 	if mc_inventory['equipped_condoms'] > 0:
 		dynamic $prezik
 	elseif mc_inventory['normal_condoms'] > 0:
-		prezik += 1
-		prezikcount -= 1
+		mc_inventory['equipped_condoms'] += 1
+		mc_inventory['normal_condoms'] -= 1
 		dynamic $prezik
 	else
 		'Your search through your pile of clothes becomes more and more frantic; you''d swear you had a condom with you! When you turn to the trucker to tell him you can''t find one, he wordlessly hands you one from his pocket before you can say anything.'

locations/gadmarket.qsrc

@@ -27,7 +27,7 @@ $gadmarkettab += FUNC ('$single_stock_item', 1, 'Computer magazine', 145, 'compm
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Biographical magazine', 145, 'biomag', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 145, 'cookmag', 'gadmarket')
 $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 = 0: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'mc_inventory[''equipped_condoms'']', 'gadmarket')
 if preziktype = 1 or preziktype = 2: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezikcount', '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')

locations/hookup.qsrc

@@ -1599,7 +1599,7 @@ if $ARGS[0] = 'condoms':
 				act'Put a condom on him':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-					prezikcount -= 1
+					mc_inventory['normal_condoms'] -= 1
 					hookup['condom'] = 1
 					'You lean over the side of the bed and reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open and roll it onto his cock for him.'
 					'"Gotta practice safe sex," you wink.'
@@ -1613,7 +1613,7 @@ if $ARGS[0] = 'condoms':
 				act'Put a condom on him with your mouth':
 					cla & *clr
 					'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
-					prezikcount -= 1
+					mc_inventory['normal_condoms'] -= 1
 					hookup['condom'] = 1
 					'You lean over the side of the bed and reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open, and place the rubber onto the tip of his penis, kissing it through the rubber. Then, using your fingers, you unroll it smoothly over the length of his cock, your lips following all the way down. You bob your head up and down a few more times to make sure it''s all the way on before glancing up at him.'
 					'"Gotta practice safe sex," you smile.'
@@ -1759,7 +1759,7 @@ if $ARGS[0] = 'no_condom2':
 	if mc_inventory['normal_condoms']+mc_inventory['equipped_condoms'] > 0:
 		act'Get one out of your bag':
 			cla & *clr
-			prezikcount -= 1
+			mc_inventory['normal_condoms'] -= 1
 			hookup['condom'] = 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
 			'"That''s okay, I''ve got one right here," you say, pulling a rubber from your bag and tearing it open.'

locations/hookup_sex.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 		act'Put a condom on him':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			hookup['condom'] = 1
 			'You lean over the side of the bed and reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open and roll it onto his cock for him.'
 			'"Gotta practice safe sex," you wink.'
@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 		act'Put a condom on him with your mouth':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			hookup['condom'] = 1
 			'You lean over the side of the bed and reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open, and place the rubber onto the tip of his penis, kissing it through the rubber. Then, using your fingers, you unroll it smoothly over the length of his cock, your lips following all the way down. You bob your head up and down a few more times to make sure it''s all the way on before glancing up at him.'
 			'"Gotta practice safe sex," you smile.'

locations/hookup_virgin.qsrc

@@ -463,7 +463,7 @@ end
 
 if $ARGS[0] = 'virgin_condom2':
 	'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-	prezikcount -= 1
+	mc_inventory['normal_condoms'] -= 1
 	hookup['condom'] = 1
 	'You hurriedly lean over the side of the bed and reach down to your purse, groping around inside it. You manage to grab hold of a condom and tear the open the packaging and impatiently roll it onto <<$npc_firstname[$boy]>>''s cock for him.'
 	'"Okay!" you grin. "Now let''s fuck!"'
@@ -563,7 +563,7 @@ end
 
 
 if $ARGS[0] = 'virgin_condom4':
-	if will_cost <= pcs_willpwr and (prezikcount + mc_inventory['equipped_condoms'] > 0):
+	if will_cost <= pcs_willpwr and (mc_inventory['normal_condoms'] + mc_inventory['equipped_condoms'] > 0):
 		act'Put a condom on him (<<will_cost>> Willpower)':
 			gs 'willpower','pay','self'
 			gs 'stat'

locations/intro_customization.qsrc

@@ -196,9 +196,9 @@ if $ARGS[0] = 'modite_pha':
 	'<center><b>Pharmaceutical items</b></center>'
 	*nl
 	killvar '$table_display'
-	gs 'intro_customization', 'modrel_setup2', 'prezik', 'Condoms'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''equipped_condoms'']', 'Condoms'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''pregnancy_test'']', 'Pregnancy tests'
-	gs 'intro_customization', 'modrel_setup2', 'tabletki', 'Birth control pills'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''contraceptive_pill'']', 'Birth control pills'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''antibiotics'']', 'Antibiotics'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''vitamins'']', 'Vitamins'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''painkillers'']', 'Painkillers'

locations/intro_sg_tg.qsrc

@@ -689,7 +689,7 @@ if $ARGS[0] = 'game_start':
 				showobjs 1
 				gs 'obj_din', 'old'
 				!!Stuff from the backpack, phone
-				prezik = 3
+				mc_inventory['equipped_condoms'] = 3
 				mc_inventory['mag_porn'] = 40
 				gs 'internet_mobile', 'top_up_metered', 'meterd-calls', 240
 				minut = 0

locations/item_stock_db.qsrc

@@ -1,33 +1,33 @@
 # 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>>'] = ''
-
-!!	Category template
-!!	if $ARGS[0] = '':
+!'
+ 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>>'] = ''
+
+	Category template
+	if $ARGS[0] = '':
 	
-!!	end
-
-!! possible imagepath?
-!! would need some changes to the current images but makes it easier to add new items later on.
-!! also makes C&P easier
-!! $img_curr_aisle['<<item_idx>>'] = 'images/locations/shared/store/items/<<$var_curr_aisle[''<<item_idx>>'']>>.png'
+	end
 
+ possible imagepath?
+ would need some changes to the current images but makes it easier to add new items later on.
+ also makes C&P easier
+ $img_curr_aisle['<<item_idx>>'] = 'images/locations/shared/store/items/<<$var_curr_aisle[''<<item_idx>>'']>>.png'
+'
 
 !!Added
 if $ARGS[0] = 'beauty':
@@ -324,7 +324,7 @@ end
 if $ARGS[0] = 'chemist':
     item_idx = 1
     $item_curr_aisle['<<item_idx>>'] = 'Condoms' 
-    $var_curr_aisle['<<item_idx>>'] = 'contraceptive_condoms'
+    $var_curr_aisle['<<item_idx>>'] = 'equipped_condoms'
     $desc_curr_aisle['<<item_idx>>'] = 'Male contraceptive'
     quantity_curr_aisle['<<item_idx>>'] = 5 
     max_curr_aisle['<<item_idx>>'] = 0 
@@ -466,6 +466,7 @@ if $ARGS[0] = 'chemist':
     max_curr_aisle['<<item_idx>>'] = 0
     cost_curr_aisle['<<item_idx>>'] = 600
     $img_curr_aisle['<<item_idx>>'] = ''
+   !'
     item_idx = 19
     $item_curr_aisle['<<item_idx>>'] = 'Thrush medication' 
     $var_curr_aisle['<<item_idx>>'] = 'thrush_meds'
@@ -474,7 +475,7 @@ if $ARGS[0] = 'chemist':
     max_curr_aisle['<<item_idx>>'] = 0
     cost_curr_aisle['<<item_idx>>'] = 1050
     $img_curr_aisle['<<item_idx>>'] = ''
-
+'
 end
 
 !!added
@@ -928,6 +929,78 @@ cost_curr_aisle['<<item_idx>>'] = 2475
 $img_curr_aisle['<<item_idx>>'] = ''
 
 end
+if $ARGS[0] = 'market':
+    item_idx = 1
+    $item_curr_aisle['<<item_idx>>'] = 'Dishwashing detergent' 
+    $var_curr_aisle['<<item_idx>>'] = 'dish_soap'
+    $desc_curr_aisle['<<item_idx>>'] = 'Cleans dishes effectively.'
+    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 = 2
+    $item_curr_aisle['<<item_idx>>'] = 'Clothing detergent' 
+    $var_curr_aisle['<<item_idx>>'] = 'laundry_soap'
+    $desc_curr_aisle['<<item_idx>>'] = 'Cleans and refreshes clothing.'
+    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 = 3
+    $item_curr_aisle['<<item_idx>>'] = 'Plates' 
+    $var_curr_aisle['<<item_idx>>'] = 'dish_plates'
+    $desc_curr_aisle['<<item_idx>>'] = 'Durable and versatile plates.'
+    quantity_curr_aisle['<<item_idx>>'] = 8
+    max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 450
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 4
+    $item_curr_aisle['<<item_idx>>'] = 'Cosmetics' 
+    $var_curr_aisle['<<item_idx>>'] = 'Cosmetics'
+    $desc_curr_aisle['<<item_idx>>'] = 'A collection of lotions, powders and potions that make you look Fabulous. This isn''t witchcraft honest!'
+    quantity_curr_aisle['<<item_idx>>'] = 20
+	max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 1000
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 5
+    $item_curr_aisle['<<item_idx>>'] = '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 = 6
+    $item_curr_aisle['<<item_idx>>'] = '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>>'] = 10
+	max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 160
+    $img_curr_aisle['<<item_idx>>'] = ''
 
+    item_idx = 7
+    $item_curr_aisle['<<item_idx>>'] = '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>>'] = 10
+	max_curr_aisle['<<item_idx>>'] = 0
+    cost_curr_aisle['<<item_idx>>'] = 80
+    $img_curr_aisle['<<item_idx>>'] = ''
+
+    item_idx = 8
+    $item_curr_aisle['<<item_idx>>'] = 'Umbrella' 
+    $var_curr_aisle['<<item_idx>>'] = 'umbrella'
+    $desc_curr_aisle['<<item_idx>>'] = 'Reliable umbrella for rainy days.'
+    quantity_curr_aisle['<<item_idx>>'] = 1
+    max_curr_aisle['<<item_idx>>'] = 1
+    cost_curr_aisle['<<item_idx>>'] = 1000
+    $img_curr_aisle['<<item_idx>>'] = ''
+end
 --- item_stock_db ---------------------------------
 

locations/leonid.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'firstTime':
 	leonidInFavour = 0
 
 	mc_inventory['painkillers'] = painkiller_bak
-	prezik = prezik_bak
+	mc_inventory['equipped_condoms'] = prezik_bak
 	mc_inventory['vitamins'] = vitamin_bak
 	mc_inventory['cosmetics'] = kosmetica_bak
 	mc_inventory['lipbalm']  = lipbalm_bak

locations/pav_disco_sex.qsrc

@@ -935,7 +935,7 @@ if $ARGS[0] = 'blowjob':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 						'"Hang on," you pause, reaching into your bag and pulling out a condom. You tear the package open and gently roll it onto <<$npc_firstname[$boy]>>''s cock, giving him a few gentle tugs when you''re finished. "Safety first."'
 						gdk['condom'] = 1
-						prezikcount -= 1
+						mc_inventory['normal_condoms'] -= 1
 						act 'Bend over':
 							gs'pav_disco_sex','insert'
 							act 'Get fucked':gt'pav_disco_sex','fuck1'

locations/pav_hotelReception.qsrc

@@ -601,7 +601,7 @@ if $ARGS[0] = 'pavgenprosmf':
 
 	if customerrand < 3:
 		if mc_inventory['equipped_condoms'] > 0:
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			'<<$boydesc>> holds your head and pulls his dick out of your mouth saying: "Put one of those condoms on me, it''s time to test that pussy of yours."'
 			gs 'dinsex', 'pc_puts_condom'
 			act 'Continue': gt 'pav_hotelReception', 'vaginalmf'
@@ -632,7 +632,7 @@ if $ARGS[0] = 'pavgenprosmf':
 		end
 	elseif customerrand < 7:
 		if mc_inventory['equipped_condoms'] > 0:
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			'You move his dick out of your mouth and tell him to put on a condom and fuck you.'
 			gs 'dinsex', 'boy_puts_condom'
 			act 'Continue': gt 'pav_hotelReception', 'vaginalmf'

locations/pav_pharmacy.qsrc

@@ -307,9 +307,9 @@ if $ARGS[0] = 'condom_addon':
 			LudaQW['knows_sex'] = 1
 			money -= 300
 			if preziktype = 0:
-				prezik += 5
+				mc_inventory['equipped_condoms'] += 5
 			elseif preziktype = 1 or preziktype = 2:
-				prezikcount += 5
+				mc_inventory['normal_condoms'] += 5
 			end
 			cla & *clr
 			'<center><B><font color="maroon">Pharmacy</font></B></center>'
@@ -669,7 +669,7 @@ if $ARGS[0] = 'birth_control_addon':
 		act'Not a bad idea (buy birth control)':
 			cla & *nl
 			pharmacyfirstbirthcontrol = 1
-			tabletki += 1
+			mc_inventory['contraceptive_pill'] += 1
 			money -= 1870
 			gs 'stat'
 			'"That''s... not a bad idea. I guess I could while I''m here."'
@@ -680,7 +680,7 @@ if $ARGS[0] = 'birth_control_addon':
 		act'Might as well be safe (buy birth control)':
 			cla & *nl
 			pharmacyfirstbirthcontrol = 1
-			tabletki += 1
+			mc_inventory['contraceptive_pill'] += 1
 			money -= 1870
 			gs 'stat'
 			'"I guess I might as well. Just to be safe."'
@@ -707,12 +707,12 @@ if $ARGS[0] = 'buy_preg_test':
 	if pharmacyfirstpregtest = 0:
 		pharmacyfirstpregtest = 1
 		if preziktype = 0:
-			prezik += 5
+			mc_inventory['equipped_condoms'] += 5
 		elseif preziktype = 1 or preziktype = 2:
-			prezikcount += 5
+			mc_inventory['normal_condoms'] += 5
 		end
 		minut += 2
-		prezikcount += 5
+		mc_inventory['normal_condoms'] += 5
 		if fame['pav_slut'] > 150:
 			'"Aunt Luda... I need... I need a pregnancy test."'
 			'You glance up expecting an explosive reaction of surprise but are surprised yourself when you see her looking at you with what appeared to be disappointed resignation.'
@@ -746,7 +746,7 @@ if $ARGS[0] = 'buy_preg_test':
 		end
 	else
 		minut += rand(2, 5)
-		prezikcount += 5
+		mc_inventory['normal_condoms'] += 5
 		act'Meekly ask':
 			cla & *nl
 			'"I need... I need another pregnancy test, Aunt Luda" you stammer.'
@@ -970,9 +970,9 @@ if $ARGS[0] = 'morning_after_mistake_embarrassed':
 !!	end
 	act'I prefer condoms':
 		if preziktype = 0:
-			prezik += 5
+			mc_inventory['equipped_condoms'] += 5
 		elseif preziktype = 1 or preziktype = 2:
-			prezikcount += 5
+			mc_inventory['normal_condoms'] += 5
 		end
 		cla & *nl
 		'"I actually prefer using condoms," you say, embarrassedly.'
@@ -985,7 +985,7 @@ if $ARGS[0] = 'morning_after_mistake_embarrassed':
 			cla & *nl
 			'"I would, Aunt Luda," you say. "I just don''t have the money right now..."'
 			if pharmacy['bc_pills_free'] = 0:
-				tabletki += 1
+				mc_inventory['contraceptive_pill'] += 1
 				'Luda sighs deeply and pulls out a small box and slides it across the counter to you.'
 				'"I guess I can give you some this one time..." she says. "But make sure you don''t miss a single day or they might not work!" She wags her finger at you. "And you better buy some next month or you''ll be in trouble."'
 			else
@@ -1016,9 +1016,9 @@ if $ARGS[0] = 'morning_after_mistake_open':
 !!	end
 	act'I prefer condoms':
 		if preziktype = 0:
-			prezik += 5
+			mc_inventory['equipped_condoms'] += 5
 		elseif preziktype = 1 or preziktype = 2:
-			prezikcount += 5
+			mc_inventory['normal_condoms'] += 5
 		end
 		cla & *nl
 		'"I actually prefer using condoms," you say.'
@@ -1031,7 +1031,7 @@ if $ARGS[0] = 'morning_after_mistake_open':
 			cla & *nl
 			'"I would, Aunt Luda," you say. "I''m just a little tight on funds right now. I can''t afford it."'
 			if pharmacy['bc_pills_free'] = 0:
-				tabletki += 1
+				mc_inventory['contraceptive_pill'] += 1
 				'Luda sighs deeply and pulls out a small box and slides it across the counter to you.'
 				'"I guess I can give you some this one time..." she says. "But make sure you don''t miss a single day or they might not work!" She wags her finger at you. "And you better buy some next month or you''ll be in trouble."'
 			else
@@ -1379,9 +1379,9 @@ end
 if $ARGS[0] = 'luda_free_condoms_give':
 	LudaQW['condom_give_day'] = daystart
 	if preziktype = 0:
-		prezik += 10
+		mc_inventory['equipped_condoms'] += 10
 	elseif preziktype = 1 or preziktype = 2:
-		prezikcount += 10
+		mc_inventory['normal_condoms'] += 10
 	end
 	morning_after_pill += 1
 end

locations/pav_train_market.qsrc

@@ -768,10 +768,10 @@ if ARGS[0] = 9:
 	if money >= tovpay:
 		act 'Buy condoms (80<b>₽</b>)':
 			minut += 15
-			prezik += 5
+			mc_inventory['equipped_condoms'] += 5
 			i = 5
 			:cndmlp
-			if rand(0,49)-6*(8-tovpay/10) <= 0:badprezik += 1
+			if rand(0,49)-6*(8-tovpay/10) <= 0:mc_inventory['bad_condoms'] += 1
 			if i > 0: i-= 1 & jump 'cndmlp'
 			killvar 'i'
 			money -= tovpay
@@ -998,7 +998,7 @@ if ARGS[0] = 19:
 		act 'Buy birth control pills (1500 <b>₽</b>)':
 			*clr & cla
 			minut += 15
-			tabletki += 1
+			mc_inventory['contraceptive_pill'] += 1
 			temp = rand(0,3)
 			if temp = 0: 
 				tabletkiold += 1 & !Pills are expired and less effective

locations/pregriskeval.qsrc

@@ -19,7 +19,7 @@ elseif tabletkishot ! 0:
 elseif mesec > 0:
 	RESULT = -3
 elseif eff_contra = 0 or eff_contra = 4 or eff_contra = 5:
-	if ((preziktype = 1 and ((mc_inventory['sabotaged_condoms'] + prezikcount) > 0)) or preziktype = 2) and tabletkicheck = 0 and mc_inventory['contraceptive_pill'] > 0:
+	if ((preziktype = 1 and ((mc_inventory['sabotaged_condoms'] + mc_inventory['normal_condoms']) > 0)) or preziktype = 2) and tabletkicheck = 0 and mc_inventory['contraceptive_pill'] > 0:
 		RESULT = 1
 	else
 		RESULT = 0

locations/prostitution_car_negotiation.qsrc

@@ -157,7 +157,7 @@ if $ARGS[0] = 'client_regular':
 			'"I was hoping that you would work today," he tells you and you give him a smile. You remember that he '+iif($prostitute['client_scene'] = 'Vaginal', 'never asked to fuck your ass and always preferred your pussy.', 'always preferred to fuck your ass.')
 			*nl
 
-			if (prezikcount > 0 or mc_inventory['equipped_condoms'] > 0) or (prezikcount < 0 and mc_inventory['equipped_condoms'] < 0 and prostitute['std_mod'] = 0):
+			if (mc_inventory['normal_condoms'] > 0 or mc_inventory['equipped_condoms'] > 0) or (mc_inventory['normal_condoms'] < 0 and mc_inventory['equipped_condoms'] < 0 and prostitute['std_mod'] = 0):
 				'You tell him that...'
 
 				gs 'willpower', 'prostitution', 'resist', 'easy'
@@ -184,7 +184,7 @@ if $ARGS[0] = 'client_regular':
 					if prostitute['std_mod'] = 0 and prostitute_auto['regular'] = 0:
 						act 'Always use a condom':
 							cla & *nl
-							'... always use a condom.'+iif((prezikcount < 1 and mc_inventory['equipped_condoms'] <1), ' But you don''t have any with you', '')
+							'... always use a condom.'+iif((mc_inventory['normal_condoms'] < 1 and mc_inventory['equipped_condoms'] <1), ' But you don''t have any with you', '')
 
 							act 'Don''t make an exception':
 								cla & *nl
@@ -210,7 +210,7 @@ if $ARGS[0] = 'client_regular':
 										'"Perfect, you nearly gave me a heart attack." You grin. "I mean it," he says half serious, half joking. "I can''t go a week without fucking you."'
 										minut += 2
 										money -= 60
-										prezikcount = 1
+										mc_inventory['normal_condoms'] = 1
 										gs 'stat'
 
 										act 'Continue': gt 'prostitution_car_negotiation', 'client_regular_success'
@@ -427,7 +427,7 @@ if $ARGS[0] = 'negotiation_start':
 		if mesec > 0: iif(prostitute['mesec_mod'] = 0, 'He doesn''t like', 'He tells you that he likes')+' to fuck girls that have their period.'
 	end
 
-	if (prezik > 0 or mc_inventory['normal_condoms'] > 0) and (prostitute['std_mod'] = 1 or prostitute['propose'] = 2):
+	if (mc_inventory['equipped_condoms'] > 0 or mc_inventory['normal_condoms'] > 0) and (prostitute['std_mod'] = 1 or prostitute['propose'] = 2):
 		gs 'willpower', 'prostitution', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Decline and move away (<<will_cost>> Willpower)':
@@ -466,9 +466,9 @@ if $ARGS[0] = 'negotiation_start':
 		end
 	end
 
-	if (prezikcount > 0 or mc_inventory['equipped_condoms'] > 0) and prostitute['std_mod'] = 0:
+	if (mc_inventory['normal_condoms'] > 0 or mc_inventory['equipped_condoms'] > 0) and prostitute['std_mod'] = 0:
 		act 'Insist on a condom': $prostitute_client_condom = 'Yes' & gt 'prostitution_car_negotiation', 'negotiation_condom_yes'
-	elseif (prezikcount > 0 or mc_inventory['equipped_condoms'] > 0) and prostitute['std_mod'] = 1:
+	elseif (mc_inventory['normal_condoms'] > 0 or mc_inventory['equipped_condoms'] > 0) and prostitute['std_mod'] = 1:
 		act 'Accept and use a condom': $prostitute_client_condom = 'Yes' & gt 'prostitution_car_negotiation', 'negotiation_condom_yes'
 	end
 
@@ -620,7 +620,7 @@ if $ARGS[0] = 'negotiation_automatic':
 	else
 		if ((prostitute_auto['norm_bj'] = 0 and $prostitute['client_scene'] = 'Blowjob') or (prostitute_auto['norm_vag'] = 0 and $prostitute['client_scene'] = 'Vaginal') or (prostitute_auto['norm_anal'] = 0 and $prostitute['client_scene'] = 'Anal')): prostitute_auto['willpower'] = 1
 
-		if ((prostitute_auto['norm_bj_condom'] = 1 and $prostitute['client_scene'] = 'Blowjob') or (prostitute_auto['norm_vag_condom'] = 1 and $prostitute['client_scene'] = 'Vaginal') or (prostitute_auto['norm_anal_condom'] = 1 and $prostitute['client_scene'] = 'Anal')) and (prezikcount > 0 or mc_inventory['equipped_condoms'] > 0):
+		if ((prostitute_auto['norm_bj_condom'] = 1 and $prostitute['client_scene'] = 'Blowjob') or (prostitute_auto['norm_vag_condom'] = 1 and $prostitute['client_scene'] = 'Vaginal') or (prostitute_auto['norm_anal_condom'] = 1 and $prostitute['client_scene'] = 'Anal')) and (mc_inventory['normal_condoms'] > 0 or mc_inventory['equipped_condoms'] > 0):
 			gs 'prostitution_functions', 'will_unprotected', 'resist'
 			if prostitute['std_mod'] = 1 or rand(1,10) < 7 or ($prostitute['client_scene'] = 'Vaginal' and mesec > 0 and prostitute['mesec_mod'] = 0) or ($prostitute['client_scene'] = 'Anal' and klismaday ! daystart and prostitute['dirty_anal_mod'] = 0):
 				$prostitute_client_condom = 'Yes'

locations/prostitution_functions.qsrc

@@ -452,24 +452,24 @@ end
 
 if $ARGS[0] = 'remove_condom':
 	if mc_inventory['equipped_condoms'] > 0:
-		prezik -= 1
+		mc_inventory['equipped_condoms'] -= 1
 	elseif mc_inventory['normal_condoms'] > 0:
-		prezikcount -= 1
+		mc_inventory['normal_condoms'] -= 1
 	end
 end
 
 if $ARGS[0] = 'your_condom':
 	prostitute['condom'] = 1
-	protect = iif(prezik > 0,1,0)
+	protect = iif(mc_inventory['equipped_condoms'] > 0,1,0)
 	if mc_inventory['equipped_condoms'] > 0:
-		if rand(1,prezik) <= badprezik:
-			badprezik -= 1
+		if rand(1,mc_inventory['equipped_condoms']) <= mc_inventory['bad_condoms']:
+			mc_inventory['bad_condoms'] -= 1
 			noprotect = 1
 			sexcontra = 7
 		else
 			sexcontra = 3
 		end
-		prezik -= 1
+		mc_inventory['equipped_condoms'] -= 1
 		sexcontra = iif(preziktype = 2,7,sexcontra)
 	else
 		sexcontra = 0

locations/prostitution_pavlovsk.qsrc

@@ -184,7 +184,7 @@ if $ARGS[0] = 'start':
 		'<br>He''s one of those guys who always refuses to put on a condom. It makes no sense to ask him to use one.'
 	else
 		gs 'prostitution_functions', 'will_unprotected', 'resist', iif($prostitute['client_behavior'] = 'abusive', 'medium', 'easy')
-		if will_cost <= pcs_willpwr and (prezikcount > 0 or mc_inventory['equipped_condoms'] > 0):
+		if will_cost <= pcs_willpwr and (mc_inventory['normal_condoms'] > 0 or mc_inventory['equipped_condoms'] > 0):
 			act 'Accept, but demand a condom (<<will_cost>> Willpower)':
 				!!STDs are handled by the mod
 				cumnostd = 1
@@ -200,9 +200,9 @@ if $ARGS[0] = 'start':
 				if pro_mother['knows'] = 0 and fame['pav_prostitute'] > 200 and prostitute['pav_total'] > 25 and (($prostitute['pav_location'] = 'public' and rand(0,1000) < fame['pav_prostitute']) or ($prostitute['pav_location'] = 'private' and rand(0,2000) < fame['pav_prostitute'])): pro_mother['knows'] = 1
 				gt 'prostitution_pavlovsk', iif(prostitute['pay_regular'] > -1, 'set_<<pro_rand>>', 'rape')
 			end
-		elseif will_cost > pcs_willpwr and (prezikcount > 0 or mc_inventory['equipped_condoms'] > 0):
+		elseif will_cost > pcs_willpwr and (mc_inventory['normal_condoms'] > 0 or mc_inventory['equipped_condoms'] > 0):
 			act 'Accept, but demand a condom (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		elseif (prezikcount < 1 and mc_inventory['equipped_condoms'] < 1):
+		elseif (mc_inventory['normal_condoms'] < 1 and mc_inventory['equipped_condoms'] < 1):
 			'<br>You''re out of condoms.'
 		end
 	end

locations/saveupdater.qsrc

@@ -2017,8 +2017,8 @@ if temp_current_save_version < 00090003:
 	if breastpump > 0:		 mc_inventory['breast_pump']   = breastpump		  &killvar'breastpump'
 	if bpbottles > 0:		 mc_inventory['bottle_s']	   = bpbottles		  &killvar'bpbottles'
 	if bpbottlem > 0:		 mc_inventory['bottle_m']	   = bpbottlem		  &killvar'bpbottlem'
-!	if bpnipplebalm > 0:	 mc_inventory['nipple_cream']  = bpnipplebalm	  &killvar'bpnipplebalm'
-!	if Kandidoz > 0: 		 mc_inventory['thrush_meds']   = Kandidoz		  &killvar'Kandidoz'
+	if bpnipplebalm > 0:	 mc_inventory['nipple_cream']  = bpnipplebalm	  &killvar'bpnipplebalm'
+!	if Kandidoz > 0: 		 mc_inventory['thrush_meds']   = Kandidoz		  &killvar'Kandidoz' ! No clue what to do with this 
 	if fatdel > 0:			 mc_inventory['weight_loss_pill']= fatdel		  &killvar'fatdel'
 	if morning_after_pill > 0: mc_inventory['morning_after_pill'] = morning_after_pill &killvar'morning_after_pill'
 	if prezik > 0:			 mc_inventory['equipped_condoms'] = prezik	 	  &killvar'prezik'

locations/sex_ev_condoms.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'pc_condom_use_stats':
 	sex_ev['pc_condoms_used'] += 1
 	sex_ev['must_fuck'] = 1
 	sex_ev['condom_check'] = 1
-	prezik -= 1
+	mc_inventory['equipped_condoms'] -= 1
 	if npc_no_condoms[$boy] > 0: sex_ev['pc_insist_condom'] = 1
 end
 
@@ -1056,7 +1056,7 @@ if $ARGS[0] = 'no_condom2.1':
 	if mc_inventory['equipped_condoms'] > 0:
 		act'I''ve got some':
 			cla & *clr
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			sex_ev['condom'] = 1
 			sex_ev['must_fuck'] = 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
@@ -2361,7 +2361,7 @@ end
 
 if $ARGS[0] = 'virgin_condom_pc_ask1':
 	gs 'willpower', 'sex', 'resist', 'medium'
-	if will_cost <= pcs_willpwr and (prezikcount + mc_inventory['equipped_condoms'] > 0):
+	if will_cost <= pcs_willpwr and (mc_inventory['normal_condoms'] + mc_inventory['equipped_condoms'] > 0):
 !!	if mc_inventory['normal_condoms'] + mc_inventory['equipped_condoms'] > 0:
 		
 		act'Pull out a condom (<<will_cost>> Willpower)':

locations/sex_ev_stats.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'starting_stats':
 	sex_ev['starting_sweat'] = pcs_sweat
 	sex_ev['orgasm'] = orgasm
 	sex_ev['orgasm_limit'] = orgasm + 6
-	sex_ev['pc_condom_count'] = prezik
+	sex_ev['pc_condom_count'] = mc_inventory['equipped_condoms']
 	sex_ev['start_time'] = totminut
 	sex_ev['start_hour'] = hour
 	if $start_type[1] ! 'nomagic': sex_ev['magik'] = pcs_magik

locations/stat.qsrc

@@ -228,9 +228,9 @@ if cumloc[0] = 1 or cumloc[3] = 1 or hypnoAddict = 0:
 	killvar 'missCum'
 elseif missCum > timeTresh:
 	if pcs_horny < 90: pcs_horny = 90
-	if preziktype = 0: mc_inventory['normal_condoms'] = prezik
-	if preziktype = 2: mc_inventory['sabotaged_condoms'] = prezik
-	prezik = 0
+	if preziktype = 0: mc_inventory['normal_condoms'] = mc_inventory['equipped_condoms']
+	if preziktype = 2: mc_inventory['sabotaged_condoms'] = mc_inventory['equipped_condoms']
+	mc_inventory['equipped_condoms'] = 0
 	preziktype = 1
 end
 

locations/stat_display.qsrc

@@ -2382,18 +2382,18 @@ elseif disable_LoadSave = 2:
 end
 
 if PillToggle = 1 and mc_inventory['contraceptive_pill'] > 0:
-	Stabletki += tabletki
-	tabletki = 0
+	Stabletki += mc_inventory['contraceptive_pill']
+	mc_inventory['contraceptive_pill'] = 0
 elseif PillToggle = 0 and Stabletki > 0:
-	tabletki += Stabletki
+	mc_inventory['contraceptive_pill'] += Stabletki
 	Stabletki = 0
 end
 
 if CondomToggle = 1 and mc_inventory['equipped_condoms'] > 0:
-	Sprezik += prezik
-	prezik = 0
+	Sprezik += mc_inventory['equipped_condoms']
+	mc_inventory['equipped_condoms'] = 0
 elseif CondomToggle = 0 and Sprezik > 0:
-	prezik += Sprezik
+	mc_inventory['equipped_condoms'] += Sprezik
 	Sprezik = 0
 end
 

locations/stol.qsrc

@@ -336,9 +336,9 @@ if $ARGS[0] = 'bc':
 				'<center><img <<$set_imgh>> src="images/pc/items/accessories/birthcontrol/condoms.jpg"></center>'
 			end
 			if preziktype = 2 or mc_inventory['sabotaged_condoms'] > 0:
-				'You have <<iif(preziktype = 2, prezikcount, mc_inventory['normal_condoms']+mc_inventory['equipped_condoms'])>> normal, and <<iif(preziktype = 2, prezik+mc_inventory['sabotaged_condoms'], mc_inventory['sabotaged_condoms'])>> sabotaged <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
+				'You have <<iif(preziktype = 2, mc_inventory[''normal_condoms''], mc_inventory[''normal_condoms'']+mc_inventory[''equipped_condoms''])>> normal, and <<iif(preziktype = 2, mc_inventory[''equipped_condoms'']+mc_inventory[''sabotaged_condoms''], mc_inventory[''sabotaged_condoms''])>> sabotaged <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
 			elseif preziktype < 2 and mc_inventory['sabotaged_condoms'] = 0:
-				'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
+				'You have <<mc_inventory[''equipped_condoms'']+mc_inventory[''normal_condoms'']>> <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
 			end
 			*nl
 		else
@@ -358,7 +358,7 @@ if $ARGS[0] = 'bc':
 			end
 			if mc_inventory['contraceptive_pill'] > 0 and pillsleft[ptype] > 0:
 				'You have <<mc_inventory[''contraceptive_pill'']>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
-			elseif tabletki	= 0 and pillsleft[ptype] > 0:
+			elseif mc_inventory['contraceptive_pill']	= 0 and pillsleft[ptype] > 0:
 				'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> left.</b>'
 			elseif mc_inventory['contraceptive_pill'] > 0 and pillsleft[ptype] = 0:
 				'You have <<mc_inventory[''contraceptive_pill'']>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a>.'

locations/therapist.qsrc

@@ -1986,7 +1986,7 @@ if $ARGS[0] = 'hypnoEnd':
 		''
 		'<font color="<<$hypnocolour>>">"You are probably low on pills by now." he hands you a new box of unknown pills. "Continue taking them just like before, Understand, <i>Cunt</i>?"</font>'
 		'"Yes, <i>Master</i>."'
-		tabletki = 1
+		mc_inventory['contraceptive_pill'] = 1
 		tabletkiold = 0
 		tabletkifert = 1
 		tabletkirej = 0
@@ -2167,7 +2167,7 @@ if $ARGS[0] = 'hypnoRandom':
 		pillsleft[3] = 0
 		pillsleft[4] = 0
 		pillsleft[5] = 0
-		tabletki      = 1
+		mc_inventory['contraceptive_pill']  = 1
 		tabletkiold   = 0
 		tabletkifert  = 1
 		tabletkirej   = 0