Browse Source

[changed] converted the condom and birth control variables to the new format

Awesome 8 months ago
parent
commit
4ac99ec2cc
52 changed files with 245 additions and 243 deletions
  1. 1 1
      locations/BDsex.qsrc
  2. 7 7
      locations/Cheatmenu_din.qsrc
  3. 1 1
      locations/Komp.qsrc
  4. 1 1
      locations/LBZhouse.qsrc
  5. 7 7
      locations/MartinSex2.qsrc
  6. 15 15
      locations/NikoSlut.qsrc
  7. 1 1
      locations/Prostitute.qsrc
  8. 4 4
      locations/abduction.qsrc
  9. 4 4
      locations/artem_sex.qsrc
  10. 2 2
      locations/audition_sex3.qsrc
  11. 4 4
      locations/bedrPar.qsrc
  12. 3 3
      locations/bedrPar2.qsrc
  13. 3 3
      locations/blowPR.qsrc
  14. 17 17
      locations/booty_call_condoms.qsrc
  15. 3 3
      locations/booty_call_pillow_talk.qsrc
  16. 1 1
      locations/booty_call_start.qsrc
  17. 3 3
      locations/city_park.qsrc
  18. 2 2
      locations/city_saunawhore.qsrc
  19. 5 5
      locations/dinSex.qsrc
  20. 38 38
      locations/din_bad.qsrc
  21. 2 2
      locations/dina.qsrc
  22. 1 1
      locations/dinsexFX.qsrc
  23. 3 3
      locations/fertility.qsrc
  24. 1 1
      locations/furi.qsrc
  25. 2 2
      locations/furisex.qsrc
  26. 7 7
      locations/gas_station_gp_117.qsrc
  27. 1 1
      locations/gdktoilet_mens.qsrc
  28. 1 1
      locations/gloryhole.qsrc
  29. 4 4
      locations/hookup.qsrc
  30. 1 1
      locations/hookup_sex.qsrc
  31. 3 3
      locations/hookup_virgin.qsrc
  32. 1 1
      locations/katalkinSex.qsrc
  33. 1 1
      locations/misha.qsrc
  34. 1 1
      locations/mother.qsrc
  35. 1 1
      locations/pav_disco_sex.qsrc
  36. 8 8
      locations/pav_hotelReception.qsrc
  37. 3 3
      locations/pav_shared_apt.qsrc
  38. 1 1
      locations/pregriskeval.qsrc
  39. 11 11
      locations/prostitution_car_negotiation.qsrc
  40. 3 3
      locations/prostitution_functions.qsrc
  41. 3 3
      locations/prostitution_pavlovsk.qsrc
  42. 4 2
      locations/saveupdater.qsrc
  43. 24 24
      locations/sex_ev_condoms.qsrc
  44. 3 3
      locations/sex_ev_pillow_talk.qsrc
  45. 1 1
      locations/sex_ev_start.qsrc
  46. 2 2
      locations/stallion.qsrc
  47. 2 2
      locations/stat.qsrc
  48. 4 4
      locations/stat_display.qsrc
  49. 9 9
      locations/stol.qsrc
  50. 3 3
      locations/uni_dorm.qsrc
  51. 3 3
      locations/unused/porn_view.qsrc
  52. 9 9
      locations/unused/porn_view_construct.qsrc

+ 1 - 1
locations/BDsex.qsrc

@@ -556,7 +556,7 @@ end
 
 if $ARGS[0] = 'org':
 	protect = 0
-	if tabletki <= 0 and prezik > 0:
+	if mc_inventory['contraceptive_pill'] <= 0 and mc_inventory['equipped_condoms'] > 0:
 		dynamic $prezik
 		protect = 1
 		'<<$boydesc>> takes a condom and puts it on his <<dick>> centimeter member.'

+ 7 - 7
locations/Cheatmenu_din.qsrc

@@ -2896,14 +2896,14 @@ $cheatmenu['vartracker'] = {
 	'hypnoAddict: <<hypnoAddict>>'
 	'missCum: <<missCum>>'
 	if preziktype = 0:
-		'condoms: in use(normal)/damaged/bad condoms: <<prezik+prezikcount>>/<<preziksabo>>/<<badprezik>>'
+		'condoms: in use(normal)/damaged/bad condoms: <<mc_inventory[''equipped_condoms'']+mc_inventory[''normal_condoms''] >>/<<mc_inventory[''sabotaged_condoms'']>>/<<badprezik>>'
 	elseif preziktype = 1:
-		'condoms: (Not in use) normal/damaged/bad condoms: <<prezikcount>>/<<preziksabo>>/<<badprezik>>'
+		'condoms: (Not in use) normal/damaged/bad condoms: <<mc_inventory[''normal_condoms'']>>/<<mc_inventory[''sabotaged_condoms'']>>/<<badprezik>>'
 	else
-		'condoms: in use (damaged)/normal/bad condoms: <<prezik+preziksabo>>/<<prezikcount>>/<<badprezik>>'
+		'condoms: in use (damaged)/normal/bad condoms: <<mc_inventory[''equipped_condoms'']+mc_inventory[''sabotaged_condoms'']>>/<<mc_inventory[''normal_condoms'']>>/<<badprezik>>'
 	end
-	if tabletki > 0:
-		'pack(s) of birth control pills: <<tabletki>>'
+	if mc_inventory['contraceptive_pill'] > 0:
+		'pack(s) of birth control pills: <<mc_inventory[''contraceptive_pill'']>>'
 		if tabletkiold > 0: '	<<tabletkiold>> expired pack'
 		if tabletkifake > 0: '	<<tabletkifake>> counterfeit pack'
 		if tabletkirej > 0: '	<<tabletkirej>> factory rejected pack'
@@ -3276,9 +3276,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> <<prezik>> </b></a>'
+		*pl 'Condoms: <a href="exec:prezik=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> <<tabletki>> </b></a>'
+		*pl 'Birth control pills: <a href="exec:tabletki=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>'

+ 1 - 1
locations/Komp.qsrc

@@ -1493,7 +1493,7 @@ if $ARGS[0] = 'waitclients':
 		gt 'kompMFCtwo', 83
 	end
 
-	if webpopular > 25 and backmfc = 0 and sub > 25 and pcs_vag > 10 and prezik > 0 and clientask = 82:
+	if webpopular > 25 and backmfc = 0 and sub > 25 and pcs_vag > 10 and mc_inventory['equipped_condoms'] > 0 and clientask = 82:
 		menu_off = 1
 		*clr & cla
 		gt 'kompMFCtwo', 82

+ 1 - 1
locations/LBZhouse.qsrc

@@ -88,7 +88,7 @@ if $ARGS[0] = 'Vaginal':
 	gs 'arousal', 'vaginal', 5
 	gs 'stat'
 
-	if prezik >= 1 and preziktype = 0:
+	if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 		act 'Cum inside':
 			*clr & cla
 			'<center><video autoplay loop src="images/characters/pavlovsk/vadim/sex/mitka2.mp4"></video></center>'

+ 7 - 7
locations/MartinSex2.qsrc

@@ -64,19 +64,19 @@ if $ARGS[0] = 'MartinSexPrep':
 	*nl
 	if stat['think_virgin'] = 1:
 		'But before either of you can make another move, a nagging thought that''s been floating around the back of your head pushes to the foreground of your mind: You are a virgin. Is Martin <i>really</i> the man you want to have your first time with? Not to mention all the risks involved if you didn''t take all necessary precautions against pregnancy...'
-	elseif prezik > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex without condoms, but...', ' ')
-	elseif prezik > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. Today isn''t really a dangerous day, but it might be better to be safe than sorry. And while Martin doesn''t seem like the type who fucks random sluts, you can never be entirely sure of that, can you? You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex sans condoms, but...', ' ')
-	elseif prezik > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the sabotaged condoms sitting in it materializing before your inner eye. You could put one on Martin and get pregnant, and he would be none the wiser...'
-	elseif prezik > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. Today isn''t really a dangerous day, so the odds of that are relatively small, but still... You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the sabotaged condoms sitting in it materializing before your inner eye. You could put one on Martin and get pregnant, and he would be none the wiser...'
-	elseif prezik = 0 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
+	elseif mc_inventory['equipped_condoms'] = 0 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', only to realize that you don''t have any condoms anyway. You could stop this, of course... but then again, could you really, with his beautiful dick just inches from your pussy?'
-	elseif prezik = 0 and tabletkishot < 1 and pillcon2 < 30000: 
+	elseif mc_inventory['equipped_condoms'] = 0 and tabletkishot < 1 and pillcon2 < 30000: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', only to realize that you don''t have any condoms anyway. You could stop this, of course... but then again, could you really, with his beautiful dick just inches from your pussy?'
-	elseif prezik > 0 and preziktype ! 2: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype ! 2: 
 		'But before either of you can make another move, your eyes come to rest on your ' + iif(bag > 0,'purse','pocket') + ' and you remember the condoms sitting inside it. Sure, you don''t really need to use them since you can''t get pregnant thanks to the birth control' + iif(tabletkishot > 0,' shot',' pills') + ', but it might be less of a mess if Martin wore one. Then again, it would also be a little less intense.'
 	end
 	gs 'arousal', 'foreplay', 1

+ 15 - 15
locations/NikoSlut.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'Customer 1':
 		'You then start riding his dick while keeping eye contact as the man frequently moans.'
 		
 
-		if prezik >= 1 and preziktype = 0:
+		if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 			act 'Continue':
 				*clr & cla
 				gs 'cum_call', '', 'Biker'
@@ -152,7 +152,7 @@ if $ARGS[0] = 'Customer 1':
 		'The man begins moaning loudly. "Holy fuck, your ass is so tight!" You can tell by his heavy breathing that he''s about ready to cum.'
 		
 
-		if prezik >= 1 and preziktype = 0:
+		if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 			act 'Make him cum':
 				*clr & cla
 				gs 'cum_call', 'anus', 'Biker'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'Customer 2':
 				'You get up and walk over to the nearby wall, where you spread your legs while leaning forward and rubbing your pussy. The man quickly realizes what you want and walks up behind you before slowly inserting his cock into your pussy, causing a jolt of pleasure to fill you.' 
 				'"Uh, what a fucking tight pussy! I could fuck it for days," he mutters before he starts fucking you.'
 				
-				if prezik >= 1 and preziktype = 0:
+				if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 					act 'Make him cum':
 						*clr & cla
 						gs 'cum_call', '', 'Trucker'
@@ -286,7 +286,7 @@ if $ARGS[0] = 'Customer 2':
 				'You get up and walk over to the nearby wall, where you lean forward while lubricating your anus. The man''s eyes light up as he approaches you and starts rubbing his cock against your anus before slowly pushing it inside. You moan as you feel it pushing its way inside you and the man starts moaning with you.'
 				'"Fuck, her ass is so tight. I won''t last long at this rate," he mutters as he starts fucking your ass.'
 				
-				if prezik >= 1 and preziktype = 0:
+				if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 					act 'Make him cum':
 						*clr & cla
 						gs 'cum_call', 'anus', 'Trucker'
@@ -356,7 +356,7 @@ if $ARGS[0] = 'Customer 3':
 			'The man starts moaning as you ride him. "Damn girl, you''re so fucking hot!"'
 			
 
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Increase your pace':
 					*clr & cla
 					gs 'cum_call', '', 'Biker'
@@ -401,7 +401,7 @@ if $ARGS[0] = 'Customer 3':
 			'The man chuckles. "Oh I''ll give you a good fucking. I hope you''re ready."'
 			
 
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Continue':
 					*clr & cla
 					gs 'cum_call', '', 'Biker'
@@ -504,7 +504,7 @@ if $ARGS[0] = 'Customer 4':
 			'You nod eagerly. "Oh yes. I love being fucked in my tight little pussy."' 
 			'Your words clearly have an effect on him as he starts moaning louder and squinting his eyes.'
 			
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Make him cum':
 					*clr & cla
 					gs 'cum_call', '', 'Biker'
@@ -609,7 +609,7 @@ if $ARGS[0] = 'Customer 5':
 			'He walks up to you and aligns his dick with your pussy before pushing it inside you, causing a jolt of pleasure to hit you.' 
 			'The trucker starts thrusting inside you you both start moaning together, the trucker''s moaning growing louder as he quickly approaches his climax.'
 			
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Make him cum':
 					*clr & cla
 					gs 'cum_call', '', 'Keith'
@@ -653,7 +653,7 @@ if $ARGS[0] = 'Customer 5':
 			'"Your rear end is so tight. It''s such a nice feeling," he says before moaning loudly.'
 			
 
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Rock your hips':
 					*clr & cla
 					gs 'cum_call', 'anus', 'Keith'
@@ -894,7 +894,7 @@ if $ARGS[0] = 'Customer 7':
 			'You meekly nod your head, enjoying the pleasure of having his dick deep inside you.'
 			
 
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Continue riding him':
 					*clr & cla
 					gs 'cum_call', '', 'Trucker'
@@ -937,7 +937,7 @@ if $ARGS[0] = 'Customer 7':
 			'"How are you enjoying this sweetie?" he asks as he starts fucking you.'
 			'You give him a smile. "I''m loving it!"'
 			
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Continue':
 					*clr & cla
 					gs 'cum_call', 'anus', 'Trucker'
@@ -1047,7 +1047,7 @@ if $ARGS[0] = 'Customer 8':
 			'You take the trucker''s hand and lead him to the toilet before giving him a light push, causing him to fall onto it. You unbutton his pants and start stroking his dick for a few seconds before turning around and aligning it with your pussy. You slowly lower yourself down, feeling it slide deep inside you, expanding your insides.' 
 			'You start riding his dick slowly as he grabs onto your breasts and gives them a firm squeeze before licking your nipple.'
 			
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Increase your pace':
 					*clr & cla
 					gs 'cum_call', '', 'Trucker'
@@ -1085,7 +1085,7 @@ if $ARGS[0] = 'Customer 8':
 			'You approach the trucker and unbutton his pants before quickly turning on the sink and wetting your fingertips, which you use to lubricate your anus before giving the man a wink and turning around, lifting your ass toward him.' 
 			'He starts rubbing the tip of his dick against your anus and you close your eyes as you feel it pushing its way inside of you, expanding your anus. The man gives your ass a few seconds to adjust before thrusting his hips, pushing his dick further inside you while you rock your hips to match his pace.'
 			
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Increase your pace':
 					*clr & cla
 					gs 'cum_call', 'anus', 'Trucker'
@@ -1180,7 +1180,7 @@ if $ARGS[0] = 'Customer 9':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/6/ride1.jpg"></center>'
 			'As soon as you arrive at the restroom, the trucker runs his hand up your leg. "I want your pussy wrapped around my dick." You happily nod, causing him to grin widely. "Gooood girrrrll." He smacks your ass before pulling his pants down and sitting on the toilet. You align your pussy with his cock and press yourself down onto it, feeling it squeezing its way inside you, evoking moans from both of you.'
 			
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Ride his cock':
 					*clr & cla
 					gs 'cum_call', '', 'Trucker'
@@ -1222,7 +1222,7 @@ if $ARGS[0] = 'Customer 9':
 			*nl
 			'He then turns you around as he turns on the sink, lubing up his dick before he slowly pushes it inside your ass. He waits for your ass to adjust before thrusting it deeper inside you and fucking your ass at a moderate pace.'
 			
-			if prezik >= 1 and preziktype = 0:
+			if mc_inventory['equipped_condoms'] >= 1 and preziktype = 0:
 				act 'Let him fuck your ass':
 					*clr & cla
 					gs 'cum_call', 'anus', 'Trucker'

+ 1 - 1
locations/Prostitute.qsrc

@@ -306,7 +306,7 @@ if $ARGS[0] = 'work2':
 		'Once you''re in the car you slide your hand on his crotch. The man quickly drives to a quiet place, about two streets away from where he picked you up. You can already feel an impressive bulge as you reach into his pants and you compliment him on his nice cock when you finally liberate it. He''s nearly fully erect, and if you look closely you can actually see his cock throbbing.'
 		gs 'arousal', 'foreplay', 5, 'prostitution', 'unknown'
 		gs 'stat'
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			protect = 1
 			act 'Put on a condom, using your mouth':
 				cla

+ 4 - 4
locations/abduction.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 	'The man leaves without saying another word as you tearfully sob and yell for him to come back.'
 	gs 'underwear', 'remove'
 	painkiller_bak = mc_inventory['painkillers']
-	prezik_bak = prezik
+	prezik_bak = mc_inventory['equipped_condoms']
 	vitamin_bak = mc_inventory['vitamins']
 	kosmetica_bak = mc_inventory['cosmetics']
 	lipbalm_bak = mc_inventory['lipbalm']
@@ -56,7 +56,7 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 	deodorant_bak = mc_inventory['deodorant']
 
 	mc_inventory['painkillers'] = 0
-	prezik = 0
+	mc_inventory['equipped_condoms'] = 0
 	mc_inventory['vitamins'] = 0
 	mc_inventory['cosmetics'] = 0
 	mc_inventory['lipbalm']  = 0
@@ -555,7 +555,7 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	gs 'stat'
 
 	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
@@ -1089,7 +1089,7 @@ if $ARGS[0] = 'abdSoldSauna':
 	workDolg = 40000
 
 	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

+ 4 - 4
locations/artem_sex.qsrc

@@ -240,8 +240,8 @@ if $ARGS[0] = 'sex':
 						gs 'boyStat', 'A2'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/first7.jpg"></center>'
 						if preziktype ! 1:
-							if prezik > 0:
-								prezik -= 1
+							if mc_inventory['equipped_condoms'] > 0:
+								mc_inventory['equipped_condoms'] -= 1
 								noprotect = 0
 								'You grab a condom out of your purse and tell him to put it on. He struggles to do so, but eventually manages to get it.'
 							else
@@ -299,8 +299,8 @@ if $ARGS[0] = 'sex':
 						gs 'boyStat', 'A2'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/first7.jpg"></center>'
 						if preziktype ! 1:
-							if prezik > 0:
-								prezik -= 1
+							if mc_inventory['equipped_condoms'] > 0:
+								mc_inventory['equipped_condoms'] -= 1
 								noprotect = 0
 								'You grab a condom out of your purse and tell him to put it on. He struggles do so, but eventually manages to get it.'
 							else

+ 2 - 2
locations/audition_sex3.qsrc

@@ -608,7 +608,7 @@ if $ARGS[0] = 'slutty_fuck':
 				gt'audition_sex3','slutty_fuck2'
 			end
 		end
-		if prezikcount > 0:
+		if mc_inventory['normal_condoms'] > 0:
 			act'Put on a condom on him':
 				audition['condom'] = 1
 				if stat['think_virgin'] = 1:
@@ -636,7 +636,7 @@ if $ARGS[0] = 'slutty_fuck':
 				gt'audition_sex3','slutty_fuck1'
 			end
 		end
-		if prezikcount > 0:
+		if mc_inventory['normal_condoms'] > 0:
 			act'Put on a condom on him':
 				audition['condom'] = 1
 				if stat['think_virgin'] = 1:

+ 4 - 4
locations/bedrPar.qsrc

@@ -19,7 +19,7 @@ if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minute
 if $ARGS[0] = '' or $ARGS[0] = 'start':
 	if locat['Mother'] = 26 and fromoutside and $home['current'] = 'parents_home':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
-		if prezik > 0 and rand(1,3) = 1 and mom['condoms'] = 0:
+		if mc_inventory['equipped_condoms'] > 0 and rand(1,3) = 1 and mom['condoms'] = 0:
 			gt 'mother', 'condom_find'
 		elseif mc_inventory['dildo_small'] + mc_inventory['dildo_normal'] + mc_inventory['dildo_big'] + mc_inventory['dildo_large'] + mc_inventory['dildo_huge'] + mc_inventory['dildo_enormous'] + mc_inventory['dildo_gigantic'] > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
 			gt 'mother', 'dildo_find'
@@ -138,11 +138,11 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if $home['current'] = 'parents_home':
 			'<table><tr><td valign="top">Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 
-			if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
+			if mc_inventory['contraceptive_pill'] > 0 and mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 				'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
-			elseif tabletki > 0:
+			elseif mc_inventory['contraceptive_pill'] > 0:
 				'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers.'
-			elseif prezik + prezikcount + preziksabo > 0:
+			elseif mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 				'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
 			end
 			

+ 3 - 3
locations/bedrPar2.qsrc

@@ -42,12 +42,12 @@ if $ARGS[0] = '':
 					menu_off = 1
 					minut+= rand(5,7)
 					gs 'stat'
-					if preziktype = 0: prezik += rand(1,3)
-					if preziktype = 1 or preziktype = 2: prezikcount += rand(1,3)
+					if preziktype = 0: mc_inventory['equipped_condoms'] += rand(1,3)
+					if preziktype = 1 or preziktype = 2: mc_inventory['normal_condoms'] += rand(1,3)
 					prezikday = daystart
 					prezikProver = 0
 					'<center><img <<$set_imgh>> src="images/pc/items/accessories/birthcontrol/condoms_steal.jpg"></center>'
-					'After you make sure you''re not seen, you quickly search your parents'' room for their condom stash and take a few. You now have '+iif(preziktype = 0, '<<prezik>>', '<<prezikcount>>')+' condoms.'
+					'After you make sure you''re not seen, you quickly search your parents'' room for their condom stash and take a few. You now have '+iif(preziktype = 0, '<<mc_inventory[''equipped_condoms'']>>', '<<mc_inventory[''normal_condoms'']>>')+' condoms.'
 					act 'Continue': gt 'bedrPar2'
 				end
 			end

+ 3 - 3
locations/blowPR.qsrc

@@ -14,8 +14,8 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/bj.jpg"></center>'
 	'You slide your hand onto his crotch, once you''re in his car. The man quickly drives to a quiet area, about two streets away. You can feel an impressive bulge when you reach into his pants, and compliment him on his nice cock when you liberate it. He''s nearly fully erect already, and if you look closely you can actually see the cock throbbing.'
 
-	if prezik > 0:act 'Put on a condom, using your mouth':sexcontra = 3 & gt'blowPR','1'
-	if prezik = 0:act 'Get him hard with your mouth':gt'blowPR','2'
+	if mc_inventory['equipped_condoms'] > 0:act 'Put on a condom, using your mouth':sexcontra = 3 & gt'blowPR','1'
+	if mc_inventory['equipped_condoms'] = 0:act 'Get him hard with your mouth':gt'blowPR','2'
 end
 
 if $ARGS[0] = '1':
@@ -26,7 +26,7 @@ if $ARGS[0] = '1':
 	gs 'dinSex', 'std_trigger_oral'
 	protect = 0
 	*clr & cla
-	prezik -= 1
+	mc_inventory['equipped_condoms'] -= 1
 	gs 'arousal', 'bj', 5, 'unknown', 'prostitution'
 	gs'stat'
 	menu_off = 1

+ 17 - 17
locations/booty_call_condoms.qsrc

@@ -77,11 +77,11 @@ if $ARGS[0] = 'pc_condom_use_stats':
 	booty_call['condom'] = 1
 	booty_call['pc_condoms_used'] += 1
 	booty_call['must_fuck'] = 1
-	prezik -= 1
+	mc_inventory['equipped_condoms'] -= 1
 end
 
 if $ARGS[0] = 'pc_need_condoms':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Use your condoms':
 			booty_call['pc_wants_condoms'] = 1
 			cla & *nl
@@ -92,7 +92,7 @@ if $ARGS[0] = 'pc_need_condoms':
 end
 
 if $ARGS[0] = 'pc_condoms':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Put a condom on him':
 			gs 'booty_call_condoms', 'pc_condom_use_stats'
 			cla & *clr
@@ -336,15 +336,15 @@ if $ARGS[0] = 'npc_out_of_condoms':
 	end
 	gs 'booty_call_after', 'no_condom_end'
 	gs 'booty_call_condoms', 'pc_skip_the_condom'
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Use one of your condoms':
 			booty_call['using_pc_condoms'] = 1
 			gs 'booty_call_condoms', 'pc_condom_use'
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-			if prezik > 1:
+			if mc_inventory['equipped_condoms'] > 1:
 				'"That''s okay, I''ve got some."'
-			elseif prezik = 1:
+			elseif mc_inventory['equipped_condoms'] = 1:
 				'"That''s okay, I''ve got one."'
 			end
 			'You reach into your bag and pull out a condom, rolling it onto his cock.'
@@ -377,7 +377,7 @@ if $ARGS[0] = 'npc_promise_wont_creampie':
 		cla & *nl
 		'"No," you say adamantly. "We <i>need</i> a condom. I''m not fucking you without one."'
 		'"Ugh fine..." he sighs. "But I don''t have any. Do you?"'
-		if prezik = 0:
+		if mc_inventory['equipped_condoms'] = 0:
 			'"No..." you say, a little embarrassed. "I thought you would."'
 			if npc_no_condoms_know[$boy] = 1:
 				'"I can''t imagine why you''d think that," he replies dryly. "You know I don''t use them."'
@@ -615,10 +615,10 @@ if $ARGS[0] = 'no_condom2':
 end
 
 if $ARGS[0] = 'no_condom2.1':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'I''ve got some':
 			cla & *clr
-			prezik -= 1
+			mc_inventory['equipped_condoms'] -= 1
 			booty_call['condom'] = 1
 			booty_call['must_fuck'] = 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
@@ -965,7 +965,7 @@ if $ARGS[0] = 'reenable_condoms2':
 				cla & *nl
 				'"This isn''t up for debate," you insist. "It''s condoms or we can''t fuck anymore."'
 				'"Ugh, fine. But you need to bring them. I don''t have any."'
-				if prezik = 0:
+				if mc_inventory['equipped_condoms'] = 0:
 					act'Uh oh':
 						cla & *nl
 						'"Uhh..."'
@@ -1069,7 +1069,7 @@ if $ARGS[0] = 'reenable_condoms2':
 		'"That''s fair," <<$npc_firstname[$boy]>> nods. "So do you want to use mine or yours today?"'
 		act'Yours':
 			cla & *nl
-			if prezik = 0:
+			if mc_inventory['equipped_condoms'] = 0:
 				'"Yours," you say. "I don''t have any on me today."'
 				'<<$npc_firstname[$boy]>> nods again and reaches for a condom from his nightstand while you wait, happy that this didn''t have to be a big deal.'
 			else
@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'reenable_condoms2':
 			act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 		end
 		
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			act'Mine':
 				cla & *nl
 				'"Mine," you smile, happy that this didn''t have to be a big deal.'
@@ -1273,7 +1273,7 @@ if $ARGS[0] = 'need_condoms_today':
 				gs 'booty_call_condoms', 'no_condom2'
 			end
 		end
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			act'Use yours':
 				cla & *nl
 				'"Sorry," you say pulling out a condom from your bag. "We should use protection today."'
@@ -1345,7 +1345,7 @@ if $ARGS[0] = 'pc_dangerous_day':
 					gs 'booty_call_condoms', 'npc_condom_put_on'
 				elseif npc_no_condoms[$boy] = 1 and npc_childfree[$boy] = 1:
 					'"Ugh fine..." he sighs. "But I don''t have any. We need to use yours."'
-					if prezik = 0:
+					if mc_inventory['equipped_condoms'] = 0:
 						'"I don''t have any..." you say reluctantly. "I thought you would."'
 						if npc_no_condoms_know[$boy] = 1:
 							'"I can''t imagine why you''d think that," he replies dryly. "You know I don''t use them."'
@@ -1366,7 +1366,7 @@ if $ARGS[0] = 'pc_dangerous_day':
 					act'Ask to use his':
 						cla & *clr
 						$npc_apt_bedroom[$boy]
-						if prezik > 0:
+						if mc_inventory['equipped_condoms'] > 0:
 							'"Could we use yours?" you ask and he immediately reaches over to grab one.'
 						else
 							'"I don''t have any on me. Can we use yours?" you ask and he immediately reaches over to grab one.'
@@ -1390,7 +1390,7 @@ if $ARGS[0] = 'pc_dangerous_day2':
 			act'Ask to use his':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
-				if prezik > 0:
+				if mc_inventory['equipped_condoms'] > 0:
 					'"Could we use yours?" you ask and he immediately reaches over to grab one.'
 				else
 					'"I don''t have any on me. Can we use yours?" you ask and he immediately reaches over to grab one.'
@@ -1961,7 +1961,7 @@ if $ARGS[0] = 'virgin_no_condom_shock1':
 end
 
 if $ARGS[0] = 'virgin_npc_doesnt_condom':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Use one of your condoms':
 			'"Fine! Here!" You fish through your bag and pull one out handing it to him.'
 			'While he rolls it on, you make sounds of annoyance, glaring at him.'

+ 3 - 3
locations/booty_call_pillow_talk.qsrc

@@ -182,9 +182,9 @@ if $ARGS[0] = 'ran_out_of_condoms':
 			booty_call['keep_it_up'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-			if booty_call['out_of_condoms'] >= 1 and prezik = 0 and booty_call['pc_condom_count'] ! 0 and booty_call['condoms_used'] = 0:
+			if booty_call['out_of_condoms'] >= 1 and mc_inventory['equipped_condoms'] = 0 and booty_call['pc_condom_count'] ! 0 and booty_call['condoms_used'] = 0:
 				'"I can''t believe how many times we fucked," you giggle, looking around at the discarded rubber sleeves littering the room. "We used up every condom I had!"'
-			elseif booty_call['out_of_condoms'] >= 1 and prezik = 0 and booty_call['pc_condom_count'] ! 0:
+			elseif booty_call['out_of_condoms'] >= 1 and mc_inventory['equipped_condoms'] = 0 and booty_call['pc_condom_count'] ! 0:
 				'"I can''t believe we used <i>all</i> our condoms," you giggle, looking around at the discarded rubber sleeves littering the room. "Your stash and mine!"'
 			else
 				'"I can''t believe we used all of your condoms," you giggle, looking around at the discarded rubber sleeves littering the room.'
@@ -199,7 +199,7 @@ if $ARGS[0] = 'ran_out_of_condoms':
 			$booty_call['convo'] = 'used_all_condoms'
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-			if booty_call['out_of_condoms'] >= 1 and prezik = 0 and booty_call['condoms_used'] = booty_call['fuck_count']:
+			if booty_call['out_of_condoms'] >= 1 and mc_inventory['equipped_condoms'] = 0 and booty_call['condoms_used'] = booty_call['fuck_count']:
 				'"You really need to buy more condoms," you sigh. "It really puts an end to the fun if we can''t fuck safely."'
 				if npc_argumentative[$boy] > 0:
 					gs'booty_call_pillow_talk', 'condom_buy_fight'

+ 1 - 1
locations/booty_call_start.qsrc

@@ -344,7 +344,7 @@ if $ARGS[0] = 'invited_start':
 			end
 		end
 		
-		if pc_buy_condoms[$boy] > 0 and prezik > 0:
+		if pc_buy_condoms[$boy] > 0 and mc_inventory['equipped_condoms'] > 0:
 			act'I brought condoms':
 				pc_buy_condoms[$boy] = 2
 				cla & *nl

+ 3 - 3
locations/city_park.qsrc

@@ -571,15 +571,15 @@ if $ARGS[0] = 'prost':
 				'<center><img <<$set_imgh>> src="images/locations/highway/sex/car.jpg"></center>'
 				'To you a car drove up and a man sitting behind the wheel asked how much it would cost the vacuum. You called a standard fee of 500 <b>₽</b>. He agreed and opened Passenger door for you.'
 
-				if prezik > 0:'You got a condom and put it in your mouth, then bent over his pants and put his client condom on the penis with his mouth.'
+				if mc_inventory['equipped_condoms'] > 0:'You got a condom and put it in your mouth, then bent over his pants and put his client condom on the penis with his mouth.'
 				'You clasped lips member client and began to suck it, caress the tongue and try to take it as deep as possible.'
 				gs 'npcgeneratec', 0, 'Client', rand(15,30)
 				gs 'boyStat', $npclastgenerated
-				if prezik = 0:
+				if mc_inventory['equipped_condoms'] = 0:
 					gs 'cum_call', 'mouth_swallow', $boy
 					'Client started cumming in your mouth, you continued to suck and swallow his hot, tart sperm.'
 					gs 'dinSex', 'std_trigger_oral'
-				elseif prezik > 0:
+				elseif mc_inventory['equipped_condoms'] > 0:
 					dynamic $prezik
 					'Client finished in a condom.'
 				end

+ 2 - 2
locations/city_saunawhore.qsrc

@@ -1153,9 +1153,9 @@ end
 
 if $ARGS[0] = 'clientLeave':
 	basePay = (10 * rand(75,125))
-	if prezik = 0:
+	if mc_inventory['equipped_condoms'] = 0:
 		condomPrice = 100
-	elseif prezik > 0:
+	elseif mc_inventory['equipped_condoms'] > 0:
 		dynamic $prezik
 		condomPrice = 0
 	end

+ 5 - 5
locations/dinSex.qsrc

@@ -121,7 +121,7 @@ end
 
 if $ARGS[0] = 'wear_condom':
 	protect = 0
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		dynamic $prezik
 		protect = 1
 		if preziktype = 2:
@@ -183,7 +183,7 @@ if $ARGS[0] = 'boy_puts_condom':
 	protect = iif(prezik > 0,1,0)
 	if $ARGS[1] = '':
 		! do you have condoms?
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			if rand(1,prezik) <= badprezik: 
 				badprezik -= 1
 				noprotect = 1
@@ -204,7 +204,7 @@ if $ARGS[0] = 'boy_puts_condom':
 		$custmsg = $ARGS[1]
 		*p '<<$custmsg>>'
 		! do you have condoms?
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			if rand(1,prezik) <= badprezik: 
 				badprezik -= 1
 				noprotect = 1
@@ -236,7 +236,7 @@ if $ARGS[0] = 'pc_puts_condom':
 	protect = iif(prezik > 0,1,0)
 	if $ARGS[1] = '':
 		! do you have condoms?
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			if rand(1,prezik) <= badprezik: 
 				badprezik -= 1
 				noprotect = 1
@@ -257,7 +257,7 @@ if $ARGS[0] = 'pc_puts_condom':
 		$custmsg = $ARGS[1]
 		*p '<<$custmsg>>'
 		! do you have condoms?
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			if rand(1,prezik) <= badprezik: 
 				badprezik -= 1
 				noprotect = 1

+ 38 - 38
locations/din_bad.qsrc

@@ -170,11 +170,11 @@ if $ARGS[0] = 'd_bag':
 	end
 	
 	*nl
-	if prezik + prezikcount + preziksabo > 0:
-		if preziktype = 2 or preziksabo > 0:
-			'You have <b><<iif(preziktype = 2, prezikcount, prezikcount+prezik)>></b> normal condoms left, and <b><<iif(preziktype = 2, prezik+preziksabo, preziksabo)>></b> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu">condoms left in your purse.</a>'
-		elseif preziktype < 2 and preziksabo = 0:
-			'You have <b><<prezik+prezikcount>></b> <a href="exec:dynamic $din_Switch_Condom_Menu">condoms left in your purse.</a>'
+	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>'
+		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
 	else
 		'You are out of condoms.'
@@ -196,12 +196,12 @@ if $ARGS[0] = 'd_bag':
 	*nl
 	if amphetamine > 0:	'You have <b><<amphetamine>></b> tablets of amphetamine left in your purse. <a href="exec: gs ''drugs'', ''amphetamine'' & gs ''din_bad'', ''d_bag''">Take One</a>'
 	if joint > 0: 'You have enough weed for <b><<joint>></b> joints.'
-	if tabletki > 0 and pillsleft[ptype] > 0:
-		'You have <b><<tabletki>></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.'
+	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:
 		'You have <b><<pillsleft[ptype]>></b> <a href="exec:dynamic $d_tabletkied">birth control pills</a> left in your purse.'
-	elseif tabletki > 0 and pillsleft[ptype] = 0:
-		'You have <b><<tabletki>></b> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> 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.'
 	else
 		'You are out of birth control pills.'
 	end
@@ -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+preziksabo, preziksabo)>> sabotaged condoms left.'
+	'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.'
 	*nl
 	if preziktype > 0:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
@@ -295,7 +295,7 @@ $din_Switch_Condom_Menu = {
 	if preziktype ! 2:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 3">Switch to using sabotaged condoms</a>.'
 	end
-	if prezikcount > 0 or preziktype = 0:
+	if mc_inventory['normal_condoms'] > 0 or preziktype = 0:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 4">Sabotage a condom</a>.'
 	end
 	*nl
@@ -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+preziksabo, preziksabo)>> sabotaged condoms left.'
+	'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.'
 	*nl
 	if preziktype > 0:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
@@ -321,7 +321,7 @@ $din_Table_Condom_Menu = {
 	if preziktype ! 2:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 3">Switch to using sabotaged condoms</a>.'
 	end
-	if prezikcount > 0 or preziktype = 0:
+	if mc_inventory['normal_condoms'] > 0 or preziktype = 0:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 4">Sabotage a condom</a>.'
 	end
 	*nl
@@ -331,9 +331,9 @@ $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.
-!! preziksabo: Number of damaged condoms seveta 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 prezik > 0:
+!! to check if sveta wants to use a condom use if mc_inventory['equipped_condoms'] > 0:
 
 $din_Do_Condom_Counts = {
 	*clr & cla
@@ -343,29 +343,29 @@ $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: preziksabo = prezik
+		if preziktype = 2: mc_inventory['sabotaged_condoms'] = prezik
 		prezik = prezikcount
 		prezikcount = 0
 		preziktype = 0
 	elseif ARGS[0] = 2:
 		'You will not use a condom the next time you have sex.'
-		if preziktype = 0: prezikcount = prezik
-		if preziktype = 2: preziksabo = prezik
+		if preziktype = 0: mc_inventory['normal_condoms'] = prezik
+		if preziktype = 2: mc_inventory['sabotaged_condoms'] = prezik
 		prezik = 0
 		preziktype = 1
 	elseif ARGS[0] = 3:
 		'Use your sabotaged condom the next time you have sex.'
-		if preziktype = 0: prezikcount = prezik
-		prezik = preziksabo
-		preziksabo = 0
+		if preziktype = 0: mc_inventory['normal_condoms'] = prezik
+		prezik = mc_inventory['sabotaged_condoms']
+		mc_inventory['sabotaged_condoms'] = 0
 		preziktype = 2
 	elseif ARGS[0] = 4:
-		if preziktype ! 0 and prezikcount > 0:
-			preziksabo +=1
+		if preziktype ! 0 and mc_inventory['normal_condoms'] > 0:
+			mc_inventory['sabotaged_condoms'] +=1
 			prezikcount -=1
 			'You use a needle to punch holes in one of the condoms.'
-		elseif preziktype = 0 and prezik > 0:
-			preziksabo +=1
+		elseif preziktype = 0 and mc_inventory['equipped_condoms'] > 0:
+			mc_inventory['sabotaged_condoms'] +=1
 			prezik -=1
 			'You use a needle to punch holes in one of the condoms.'
 		else
@@ -381,35 +381,35 @@ $din_Do_Condom_Counts = {
 }
 
 $din_Update_Condom_Counts = {
-	if prezik + prezikcount + preziksabo > 0: prezikmsg = 1
+	if mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0: prezikmsg = 1
 	if preziktype = 0:
-		if prezikcount > 0:
+		if mc_inventory['normal_condoms'] > 0:
 			prezik += prezikcount
 			prezikcount = 0
 		end
-		if prezik <= 0:
+		if mc_inventory['equipped_condoms'] <= 0:
 			'You are out of condoms.'
 			prezik = 0
 			prezikcount = 0
 			preziktype = 1
 		end
 	elseif preziktype = 1:
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			prezikcount += prezik
 			prezik = 0
 		end
 	elseif preziktype = 2:
-		if preziksabo > 0:
-			prezik += preziksabo
-			preziksabo = 0
+		if mc_inventory['sabotaged_condoms'] > 0:
+			prezik += mc_inventory['sabotaged_condoms']
+			mc_inventory['sabotaged_condoms'] = 0
 		end
-		if prezik <= 0 and prezikcount <= 0:
+		if mc_inventory['equipped_condoms'] <= 0 and mc_inventory['normal_condoms'] <= 0:
 			if prezikmsg = 1:prezikmsg = 2
 			prezik = 0
-			preziksabo = 0
+			mc_inventory['sabotaged_condoms'] = 0
 			prezikcount = 0
 			preziktype = 1
-		elseif prezik <= 0 and prezikcount > 0:
+		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
@@ -532,7 +532,7 @@ $d_tabletkieda = {
 		gs 'stat'
 	end
 	
-	if tabletki = 0 and pillsleft[ptype] = 0:
+	if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 		msg 'That was your last birth control pill. You need to buy some more.'
 	end
 
@@ -1043,7 +1043,7 @@ $use_bcream = {
 
 if $ARGS[0] = 'takepill':
 
-	if tabletki > 0 and pillsleft[ptype] = 0:
+	if mc_inventory['contraceptive_pill'] > 0 and pillsleft[ptype] = 0:
 		tabletkirand = rand(1, tabletki)
 		if tabletkirand <= tabletkiold:
 			tabletki -=1
@@ -1125,7 +1125,7 @@ if $ARGS[0] = 'quick_takepill':
 	pilldaychk = daystart
 	
 	if birth_control['message_skip'] ! daystart:
-		if tabletki = 0 and pillsleft[ptype] = 0:
+		if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 			msg 'That was your last birth control pill. You need to buy some more.'
 		else
 			msg 'You take your birth control pill.'

+ 2 - 2
locations/dina.qsrc

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

+ 1 - 1
locations/dinsexFX.qsrc

@@ -8,7 +8,7 @@
 
 $vagstart = {
 !condom check, to skip just use 2
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		dynamic $prezik
 		protect = 1
 		if preziktype = 2:

+ 3 - 3
locations/fertility.qsrc

@@ -108,13 +108,13 @@ if $ARGS[0] = 'birth_control':
 	tabletkipi = 0
 	tabletkipt = 0
 	if tabletkicheck = 1:
-		if tabletki = 0 and pillsleft[ptype] = 0:
+		if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 			tabletkicheck = 0
 			'You are out of birth control pills.'
 			tabletkipi = -5
-		elseif tabletki = 0 and pillsleft[ptype] = 28:
+		elseif mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 28:
 			'You have just opened your last package of birth control pills. You need to buy more.'
-		elseif tabletki = 0 and pillsleft[ptype] <= 5:
+		elseif mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] <= 5:
 			'You are running out of birth control pills, you only have a few left.'
 		end
 	end

+ 1 - 1
locations/furi.qsrc

@@ -361,7 +361,7 @@ act 'Try to get a lift':
 				end
 			end
 
-			if prezik > 0 or prezikcount > 0:
+			if mc_inventory['equipped_condoms'] > 0 or mc_inventory['normal_condoms'] > 0:
 				act 'Yes':
 					*clr & cla
 					gs 'stat'

+ 2 - 2
locations/furisex.qsrc

@@ -21,9 +21,9 @@ end
 if ARGS[0] = 2:
 	'You nod and take off your clothes. You squeeze past him into the sleeping compartment behind the chairs, and the driver follows you. When he takes off his pants, his cock jumps free. It''s not particularly large, but still a bit above average size.'
 	'When you reach out to touch it, he playfully slaps it away and says: "Put on the condom first, girl! I don''t take risks with slutty hitchhikers."'
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		dynamic $prezik
-	elseif prezikcount > 0:
+	elseif mc_inventory['normal_condoms'] > 0:
 		prezik += 1
 		prezikcount -= 1
 		dynamic $prezik

+ 7 - 7
locations/gas_station_gp_117.qsrc

@@ -219,7 +219,7 @@ if $ARGS[0] = 'condom_dispenser':
 
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/highway/gas_station_gp_117/condoms.jpg"></center>'
-	'A condom costs 60 <b>₽</b> and you have <<prezikcount>> condoms.'
+	'A condom costs 60 <b>₽</b> and you have <<mc_inventory[''normal_condoms'']>> condoms.'
 	gs 'stat'
 
 	act 'Go back': minut += 1 & gt 'gas_station_gp_117', 'restroom'
@@ -228,8 +228,8 @@ if $ARGS[0] = 'condom_dispenser':
 		act 'Buy a condom (60 <b>₽</b>)':
 			minut += 1
 			money -= 60
-			if preziktype = 0: prezik += 1
-			if preziktype = 1 or preziktype = 2: prezikcount += 1
+			if preziktype = 0: mc_inventory['equipped_condoms'] += 1
+			if preziktype = 1 or preziktype = 2: mc_inventory['normal_condoms'] += 1
 			gt 'gas_station_gp_117', 'condom_dispenser'
 		end
 	end
@@ -238,8 +238,8 @@ if $ARGS[0] = 'condom_dispenser':
 		act 'Buy five condoms (300 <b>₽</b>)':
 			minut += 1
 			money -= 300
-			if preziktype = 0: prezik += 5
-			if preziktype = 1 or preziktype = 2: prezikcount += 5
+			if preziktype = 0: mc_inventory['equipped_condoms'] += 5
+			if preziktype = 1 or preziktype = 2: mc_inventory['normal_condoms'] += 5
 			gt 'gas_station_gp_117', 'condom_dispenser'
 		end
 	end
@@ -248,8 +248,8 @@ if $ARGS[0] = 'condom_dispenser':
 		act 'Buy ten condoms (600 <b>₽</b>)':
 			minut += 1
 			money -= 600
-			if preziktype = 0: prezik += 10
-			if preziktype = 1 or preziktype = 2: prezikcount += 10
+			if preziktype = 0: mc_inventory['equipped_condoms'] += 10
+			if preziktype = 1 or preziktype = 2: mc_inventory['normal_condoms'] += 10
 			gt 'gas_station_gp_117', 'condom_dispenser'
 		end
 	end

+ 1 - 1
locations/gdktoilet_mens.qsrc

@@ -568,7 +568,7 @@ if $ARGS[0] = 'mensglory':
 							gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 							gs 'arousal', 'end'
 							gs 'stat'
-							if prezik > 0:
+							if mc_inventory['equipped_condoms'] > 0:
 								if sexcontra = 4:
 									act 'Get up':
 										*clr & cla

+ 1 - 1
locations/gloryhole.qsrc

@@ -367,7 +367,7 @@ if $ARGS[0] = 'ghsex':
 	gs 'stat'
 	if stat['anal'] > 0: act 'Ass':gt 'gloryhole', 'anal'
 	if stat['vaginal'] > 0: 
-		if prezik > 0: act "Use a condom": gt 'gloryhole', 'condom'
+		if mc_inventory['equipped_condoms'] > 0: act "Use a condom": gt 'gloryhole', 'condom'
 
 		gs 'willpower', 'sex', 'self'
 		if will_cost <= pcs_willpwr:

+ 4 - 4
locations/hookup.qsrc

@@ -1595,7 +1595,7 @@ if $ARGS[0] = 'condoms':
 					gs'hookup','condoms2'
 				end
 			end
-			if prezikcount + prezik > 0:
+			if mc_inventory['normal_condoms'] + mc_inventory['equipped_condoms'] > 0:
 				act'Put a condom on him':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
@@ -1625,10 +1625,10 @@ if $ARGS[0] = 'condoms':
 				end
 			end
 			
-			!!{if preziksabo > 0:
+			!!{if mc_inventory['sabotaged_condoms'] > 0:
 				act'Put a sabotaged condom on him':
 					'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-					preziksabo -= 1
+					mc_inventory['sabotaged_condoms'] -= 1
 					hookup['condom'] = 1
 					'"Wait!" You pause and fish around in your purse, pulling out one of the condoms you sabotaged earlier. You tear the packaging open, rolling it onto his cock for him.'
 					'"Gotta practice safe sex," you wink.'
@@ -1756,7 +1756,7 @@ if $ARGS[0] = 'no_condom1':
 end
 
 if $ARGS[0] = 'no_condom2':
-	if prezikcount+prezik > 0:
+	if mc_inventory['normal_condoms']+mc_inventory['equipped_condoms'] > 0:
 		act'Get one out of your bag':
 			cla & *clr
 			prezikcount -= 1

+ 1 - 1
locations/hookup_sex.qsrc

@@ -3,7 +3,7 @@
 !! 1 is the starting pace, 2 is if pace changes
 
 if $ARGS[0] = 'start':
-	if prezikcount + prezik > 0:
+	if mc_inventory['normal_condoms'] + mc_inventory['equipped_condoms'] > 0:
 		act'Put a condom on him':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'

+ 3 - 3
locations/hookup_virgin.qsrc

@@ -78,7 +78,7 @@ if $ARGS[0] = 'virginity_take':
 				gs 'stat'
 				gt'hookup_virgin','virgin_condom1'
 			end
-			if prezikcount + prezik > 0:
+			if mc_inventory['normal_condoms'] + mc_inventory['equipped_condoms'] > 0:
 				act'Put a condom on him (<<will_cost>> Willpower)':
 					gs 'willpower','pay','self'
 					gs 'stat'
@@ -146,7 +146,7 @@ if $ARGS[0] = 'virginity_take2':
 				gs 'stat'
 				gt'hookup_virgin','virgin_condom1'
 			end
-			if prezikcount + prezik > 0:
+			if mc_inventory['normal_condoms'] + mc_inventory['equipped_condoms'] > 0:
 				act'Put a condom on him (<<will_cost>> Willpower)':
 					gs 'willpower','pay','self'
 					gs 'stat'
@@ -563,7 +563,7 @@ end
 
 
 if $ARGS[0] = 'virgin_condom4':
-	if will_cost <= pcs_willpwr and (prezikcount + prezik > 0):
+	if will_cost <= pcs_willpwr and (prezikcount + mc_inventory['equipped_condoms'] > 0):
 		act'Put a condom on him (<<will_cost>> Willpower)':
 			gs 'willpower','pay','self'
 			gs 'stat'

+ 1 - 1
locations/katalkinSex.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'd_katsub':
 
 					act 'Continue': gt 'katalkinSex','d_katanal'
 				end
-				if prezik > 0:
+				if mc_inventory['equipped_condoms'] > 0:
 					act 'Yes':
 						*clr & cla
 						pose = 1

+ 1 - 1
locations/misha.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = '1':
 			gs 'stat'
 			'He''s content just letting you suck him off for a bit, especially when you gather your courage and start to apply your skills. Then, after a while, he pulls back, saying, "Alright, <<$pcs_nickname>>, that was nice, but not what I had in mind for today. It''s time for the main course!"'
 			act 'Uncle Misha puts his condom on': $temp = {gs 'dinsex','boy_puts_his_condom'} & xgt 'misha','1_2nd_part'
-			if prezik > 0:act 'You put your condom on his cock': $temp = {gs 'dinsex','pc_puts_condom'} & xgt 'misha','1_2nd_part'
+			if mc_inventory['equipped_condoms'] > 0:act 'You put your condom on his cock': $temp = {gs 'dinsex','pc_puts_condom'} & xgt 'misha','1_2nd_part'
 			act 'You tell Misha that he doesn''t need a condom': $temp = '' & xgt 'misha','1_2nd_part'
 		end
 	end

+ 1 - 1
locations/mother.qsrc

@@ -1529,7 +1529,7 @@ if $ARGS[0] = 'motherQW_2':
 					'"Mooooom, come on! We just talked about this!"'
 					*nl
 					'Your mother looks serious when she raises her hand, motioning you to not interrupt. Since her attitude towards you is not as demeaning any more, you decide to listen: "Hear me out <<$pcs_nickname>>, please. I just don''t want you to get pregnant, you know? When you have a baby, it should be with the man you are going to stay with, and when you can support it."'
-					if prezik > 0 or tabletki > 0:
+					if mc_inventory['equipped_condoms'] > 0 or mc_inventory['contraceptive_pill'] > 0:
 						'"Don''t worry <<$npc_nickname[''A29'']>>, I have taken precautions. I went and bought things. When they run out, I will go get more, I promise."'
 					elseif tabletkicheck = 2:
 						'"Don''t worry <<$npc_nickname[''A29'']>>, I have taken precautions. I went to the clinic and got a birth control shot. When it runs out, I will get another one, I promise."'

+ 1 - 1
locations/pav_disco_sex.qsrc

@@ -929,7 +929,7 @@ if $ARGS[0] = 'blowjob':
 					end
 				end
 			
-				if prezikcount + prezik > 0:
+				if mc_inventory['normal_condoms'] + mc_inventory['equipped_condoms'] > 0:
 					act 'Get a condom from your purse':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'

+ 8 - 8
locations/pav_hotelReception.qsrc

@@ -600,7 +600,7 @@ if $ARGS[0] = 'pavgenprosmf':
 	customerrand = rand(0, 9)
 
 	if customerrand < 3:
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			prezik -= 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'
@@ -631,7 +631,7 @@ if $ARGS[0] = 'pavgenprosmf':
 			end
 		end
 	elseif customerrand < 7:
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			prezik -= 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'
@@ -662,7 +662,7 @@ if $ARGS[0] = 'pavgenprosmf':
 			end
 		end
 	elseif customerrand < 8:
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			'You move his dick out of your mouth and tell him to put on a condom and fuck you.'
 			'"I''d much rather fuck you raw. I hate condoms." He tells you with a pleading look in his eyes. "How about if I pay you an extra 300 to do it without?"'
 			act 'Agree':
@@ -695,7 +695,7 @@ if $ARGS[0] = 'pavgenprosmf':
 			act 'Continue': gt 'pav_hotelReception', 'vaginalmf'
 		end
 	elseif customerrand < 9:
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			'You move his dick out of your mouth and tell him to put on a condom and fuck you.'
 			'"I''d much rather fuck you raw. I hate condoms." He tells you.'
 			act 'Agree':
@@ -742,7 +742,7 @@ if $ARGS[0] = 'pavgenprosmf':
 			act 'Continue': gt 'pav_hotelReception', 'vaginalmf'
 		end
 	else
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			'You move his dick out of your mouth and tell him to put on a condom and fuck you.'
 			'"No, I''m going to fuck you raw. I hate condoms." He tells you angrily.'
 			act 'Agree':
@@ -951,7 +951,7 @@ if $ARGS[0] = 'pavgenprosmmf':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/prostitution/mmf01.jpg"></center>'
 	'The customers introduce themselves as <<$boydesc[0]>> and <<$boydesc[1]>>. "I''m <<$pcs_nickname>>. You tell them.'
 	'"We''ve just booked you for the next hour. So let''s have some fun. <<$npc_nickname[''A217'']>> said we should agree on a price to fuck both of your holes with you. Oh, and I hope you won''t insist on condoms."'
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		gs 'willpower', 'foreplay', 'force'
 		if will_cost <= pcs_willpwr:
 			act 'Insist on condoms (<<will_cost>> Willpower)':
@@ -1009,7 +1009,7 @@ if $ARGS[0] = 'sexmmf':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/prostitution/mmf02.jpg"></center>'
 		'It doesn''t take long before <<$boydesc[1]>> pulls you to your feet and guides you onto the bed saying: "Time to fuck that pussy of yours."'
 		if mmfcond = 1:
-			if prezik > 0:
+			if mc_inventory['equipped_condoms'] > 0:
 				gs 'dinsex', 'boy_puts_condom', '<<$boydesc[1]>> takes your '+iif(preziktype = 2,'sabotaged ','')+ 'condom and puts it on his <<dick[1]>>cm <<$dick_girth[1]>> dick.'
 			else
 				gs 'dinsex', 'boy_puts_his_condom', '<<$boydesc[1]>>'
@@ -1027,7 +1027,7 @@ if $ARGS[0] = 'sexmmf':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/prostitution/mmf03.jpg"></center>'
 			'"I think it''s about time she earned her bonus. Come here and ride my cock." <<$boydesc[0]>> says as he pulls you off his cock and leans back.'
 			if mmfcond = 1:
-				if prezik > 0:
+				if mc_inventory['equipped_condoms'] > 0:
 					gs 'dinsex', 'boy_puts_condom'
 				else
 					gs 'dinsex', 'boy_puts_his_condom'

+ 3 - 3
locations/pav_shared_apt.qsrc

@@ -804,11 +804,11 @@ if $ARGS[0] = 'pcsRoom':
 		end
 	end
 
-	if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
+	if mc_inventory['contraceptive_pill'] > 0 and mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> tablets are in the cabinet next to your bed, along with some <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
-	elseif tabletki > 0:
+	elseif mc_inventory['contraceptive_pill'] > 0:
 		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> tablets are in the cabinet next to your bed.'
-	elseif prezik + prezikcount + preziksabo > 0:
+	elseif mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 		'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are in the cabinet next to your bed.'
 	end
 	''

+ 1 - 1
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 ((preziksabo + prezikcount) > 0)) or preziktype = 2) and tabletkicheck = 0 and tabletki > 0:
+	if ((preziktype = 1 and ((mc_inventory['sabotaged_condoms'] + prezikcount) > 0)) or preziktype = 2) and tabletkicheck = 0 and mc_inventory['contraceptive_pill'] > 0:
 		RESULT = 1
 	else
 		RESULT = 0

+ 11 - 11
locations/prostitution_car_negotiation.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'general_description':
 		' - Start scene will be '+iif(prostitute['skip_start'] = 0, '<a href="exec: prostitute[''skip_start''] = 1 & gt ''<<$loc>>'', ''work''">shown</a>.', '<a href="exec: prostitute[''skip_start''] = 0 & gt ''<<$loc>>'', ''work''">skipped</a>.')
 		*nl
 
-		if prezikcount < 1 and prezik < 1 and (prostitute_auto['norm_bj_condom'] + prostitute_auto['norm_vag_condom'] + prostitute_auto['norm_anal_condom'] + prostitute_auto['reg_vag_condom'] + prostitute_auto['reg_anal_condom']):
+		if mc_inventory['normal_condoms'] < 1 and mc_inventory['equipped_condoms'] < 1 and (prostitute_auto['norm_bj_condom'] + prostitute_auto['norm_vag_condom'] + prostitute_auto['norm_anal_condom'] + prostitute_auto['reg_vag_condom'] + prostitute_auto['reg_anal_condom']):
 			'<b>You''re out of condoms!</b>'
 			*nl
 		end
@@ -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 prezik > 0) or (prezikcount < 0 and prezik < 0 and prostitute['std_mod'] = 0):
+			if (prezikcount > 0 or mc_inventory['equipped_condoms'] > 0) or (prezikcount < 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 prezik <1), ' But you don''t have any with you', '')
+							'... always use a condom.'+iif((prezikcount < 1 and mc_inventory['equipped_condoms'] <1), ' But you don''t have any with you', '')
 
 							act 'Don''t make an exception':
 								cla & *nl
@@ -192,7 +192,7 @@ if $ARGS[0] = 'client_regular':
 								$prostitute_client_cumshot = 'Outside or Condom'
 								gs 'prostitution_functions', 'payment', 'condom_yes', 'inside_no'
 
-								if prezikcount > 0 or prezik > 0:
+								if mc_inventory['normal_condoms'] > 0 or mc_inventory['equipped_condoms'] > 0:
 									'You pull out a condom out of your '+iif(bag = 1, 'purse', 'pocket')+' and he nods. "No problem <<$prostitute_names[$used_name]>>, better safe than sorry."'
 
 									act 'Continue': gt 'prostitution_car_negotiation', 'client_regular_success'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'client_regular':
 						if (prostitute_auto['reg_vag_condom'] = 1 and $prostitute['client_scene'] = 'Vaginal') or (prostitute_auto['reg_anal_condom'] = 1 and $prostitute['client_scene'] = 'Anal'):
 							$prostitute_client_condom = 'Yes'
 							$prostitute_client_cumshot = 'Outside or Condom'
-							if prezikcount < 1: prezikcount = 1 & money -= 60
+							if mc_inventory['normal_condoms'] < 1: mc_inventory['normal_condoms'] = 1 & money -= 60
 						else
 							$prostitute_client_condom = 'No'
 							if (prostitute_auto['reg_vag_creampie'] = 1 and $prostitute['client_scene'] = 'Vaginal') or (prostitute_auto['reg_anal_creampie'] = 1 and $prostitute['client_scene'] = 'Anal'):
@@ -325,7 +325,7 @@ if $ARGS[0] = 'client_regular_fail':
 	*nl
 	'"Shit? Really?" You nod and he looks disheartened. After a moment he shrugs and throws you a grin. "Don''t worry about it <<$prostitute_names[$used_name]>>, it''s fine, you''re always worth the wait."'
 	*nl
-	'"Thanks," you say and step away from the car.'+iif(prostitute['std_mod'] = 1 and prezikcount < 1 and prezik < 1, ' As you walk away you think about your decision for a moment. In the end it was the right choice, he was always nice to you and without a condom he surely would catch your STD.', '')
+	'"Thanks," you say and step away from the car.'+iif(prostitute['std_mod'] = 1 and mc_inventory['normal_condoms'] < 1 and mc_inventory['equipped_condoms'] < 1, ' As you walk away you think about your decision for a moment. In the end it was the right choice, he was always nice to you and without a condom he surely would catch your STD.', '')
 
 	act 'Continue': gt $loc, 'work'
 end
@@ -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 prezikcount > 0) and (prostitute['std_mod'] = 1 or prostitute['propose'] = 2):
+	if (prezik > 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,15 +466,15 @@ if $ARGS[0] = 'negotiation_start':
 		end
 	end
 
-	if (prezikcount > 0 or prezik > 0) and prostitute['std_mod'] = 0:
+	if (prezikcount > 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 prezik > 0) and prostitute['std_mod'] = 1:
+	elseif (prezikcount > 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
 
 	if prostitute['std_mod'] = 0:
 		act 'Don''t insist on a condom': $prostitute_client_condom = 'No' & gt 'prostitution_car_negotiation', 'negotiation_condom_no'
-	elseif prezikcount < 0 and prezik < 0 and prostitute['std_mod'] = 1:
+	elseif mc_inventory['normal_condoms'] < 0 and mc_inventory['equipped_condoms'] < 0 and prostitute['std_mod'] = 1:
 		act 'Tell him you don''t have a condom':
 			if rand(1,10) < 9:
 				gt 'prostitution_car_negotiation', 'negotiation_fail'
@@ -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 prezik > 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 (prezikcount > 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'

+ 3 - 3
locations/prostitution_functions.qsrc

@@ -451,9 +451,9 @@ if $ARGS[0] = 'std_oral_chance':
 end
 
 if $ARGS[0] = 'remove_condom':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		prezik -= 1
-	elseif prezikcount > 0:
+	elseif mc_inventory['normal_condoms'] > 0:
 		prezikcount -= 1
 	end
 end
@@ -461,7 +461,7 @@ end
 if $ARGS[0] = 'your_condom':
 	prostitute['condom'] = 1
 	protect = iif(prezik > 0,1,0)
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		if rand(1,prezik) <= badprezik:
 			badprezik -= 1
 			noprotect = 1

+ 3 - 3
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 prezik > 0):
+		if will_cost <= pcs_willpwr and (prezikcount > 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 prezik > 0):
+		elseif will_cost > pcs_willpwr and (prezikcount > 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 prezik < 1):
+		elseif (prezikcount < 1 and mc_inventory['equipped_condoms'] < 1):
 			'<br>You''re out of condoms.'
 		end
 	end

+ 4 - 2
locations/saveupdater.qsrc

@@ -2021,8 +2021,10 @@ if temp_current_save_version < 00090003:
 !	if Kandidoz > 0: 		 mc_inventory['thrush_meds']   = Kandidoz		  &killvar'Kandidoz'
 	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['contraceptive_condoms'] = prezik	  &killvar'prezik'
-!	if tabletki > 0:		 mc_inventory['contraceptive_pill'] = tabletki    &killvar'tabletki' 
+	if prezik > 0:			 mc_inventory['contraceptive_condoms'] = prezik	  &killvar'prezik'
+	if prezikcount > 0:		 mc_inventory['normal_condoms'] 	= prezikcount	  &killvar'prezikcount'
+	if mc_inventory['sabotaged_condoms']
+	if tabletki > 0:		 mc_inventory['contraceptive_pill'] = tabletki    &killvar'tabletki' 
 	if siga > 0:			 mc_inventory['cigarettes']	    = siga			  &killvar'siga' 
 	if fashmag > 0:			 mc_inventory['mag_fashion']	= fashmag		  &killvar'fashmag' 
 	if compmag > 0:			 mc_inventory['mag_computer']	= compmag		  &killvar'compmag' 

+ 24 - 24
locations/sex_ev_condoms.qsrc

@@ -101,7 +101,7 @@ if $ARGS[0] = 'condom_wait':
 				end
 			end
 			
-			if prezik > 0:
+			if mc_inventory['equipped_condoms'] > 0:
 				act'Pull one out':
 					cla & *nl
 					'"Wait!" you yelp and scramble for your bag to pull out a condom, holding it between you. "You need to use a condom. Please?"'
@@ -131,7 +131,7 @@ if $ARGS[0] = 'npc_condom_use_stats':
 end
 
 if $ARGS[0] = 'pc_need_condoms':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Use your condoms':
 			sex_ev['pc_wants_condoms'] = 1
 			cla & *nl
@@ -142,7 +142,7 @@ if $ARGS[0] = 'pc_need_condoms':
 end
 
 if $ARGS[0] = 'pc_condoms':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Pull out a condom':
 			sex_ev['using_pc_condoms'] = 1
 			cla & *nl
@@ -194,7 +194,7 @@ if $ARGS[0] = 'pc_condoms2':
 end
 
 if $ARGS[0] = 'pc_use_condoms':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Put a condom on him':
 			gs 'sex_ev_condoms', 'pc_condom_use_stats'
 			cla & *clr
@@ -519,15 +519,15 @@ if $ARGS[0] = 'npc_out_of_condoms':
 	end
 	gs 'sex_ev_after', 'no_condom_end'
 	gs 'sex_ev_condoms', 'pc_skip_the_condom'
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Use one of your condoms':
 			sex_ev['using_pc_condoms'] = 1
 			gs 'sex_ev_condoms', 'pc_use_condoms'
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-			if prezik > 1:
+			if mc_inventory['equipped_condoms'] > 1:
 				'"That''s okay, I''ve got some."'
-			elseif prezik = 1:
+			elseif mc_inventory['equipped_condoms'] = 1:
 				'"That''s okay, I''ve got one."'
 			end
 			'You reach into your bag and pull out a condom, rolling it onto his cock.'
@@ -783,7 +783,7 @@ if $ARGS[0] = 'insist_need_condom':
 			gs 'sex_ev_condoms', 'npc_condom_put_on'
 		else
 			'"Ugh, <i>fine</i>..." he sighs. "But I don''t have any. Do you?"'
-			if prezik = 0:
+			if mc_inventory['equipped_condoms'] = 0:
 				'"No..." you say, a little embarrassed. "I thought you would."'
 				if npc_no_condoms_know[$boy] = 1:
 					'"I can''t imagine why you''d think that," he replies dryly. "You know I don''t use them."'
@@ -941,7 +941,7 @@ if $ARGS[0] = 'no_condom1':
 				gs 'sex_ev_virgin', 'no_condom_offer'
 			elseif sex_ev['danger_day'] = 1 and npc_childfree[$boy] > 0:
 				sex_ev['condom'] = 1
-				if sex_ev['using_pc_condoms'] = 1 and prezik > 0:
+				if sex_ev['using_pc_condoms'] = 1 and mc_inventory['equipped_condoms'] > 0:
 					'"What the fuck! Why didn''t you say so!" he says, immediately taking the condom from you and clumsily rolling the little rubber onto his cock.'
 					gs 'sex_ev_condoms', 'pc_condom_use_stats'
 					if $sex_ev['position'] ! 'miss' or $sex_ev['position'] ! 'doggy' or $sex_ev['position'] ! 'cowgirl': $sex_ev['position'] = 'miss'
@@ -953,7 +953,7 @@ if $ARGS[0] = 'no_condom1':
 			elseif rand(1,10) < 8:
 				sex_ev['condom'] = 1
 				sex_ev['pc_insist_condom'] = 1
-				if sex_ev['using_pc_condoms'] = 1 and prezik > 0:
+				if sex_ev['using_pc_condoms'] = 1 and mc_inventory['equipped_condoms'] > 0:
 					'"Ugh, fine," <<$npc_firstname[$boy]>> grumbles, taking the condom from you and clumsily rolling the little rubber onto his cock.'
 					gs 'sex_ev_condoms', 'pc_condom_use_stats'
 					if $sex_ev['position'] ! 'miss' or $sex_ev['position'] ! 'doggy' or $sex_ev['position'] ! 'cowgirl': $sex_ev['position'] = 'miss'
@@ -1053,7 +1053,7 @@ if $ARGS[0] = 'no_condom2':
 end
 
 if $ARGS[0] = 'no_condom2.1':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'I''ve got some':
 			cla & *clr
 			prezik -= 1
@@ -1434,7 +1434,7 @@ if $ARGS[0] = 'reenable_condoms2':
 		'"That''s fair," <<$npc_firstname[$boy]>> nods. "So do you want to use mine or yours today?"'
 		act'Yours':
 			cla & *nl
-			if prezik = 0:
+			if mc_inventory['equipped_condoms'] = 0:
 				'"Yours," you say. "I don''t have any on me today."'
 				'<<$npc_firstname[$boy]>> nods again and reaches for a condom from his nightstand while you wait, happy that this didn''t have to be a big deal.'
 			else
@@ -1444,7 +1444,7 @@ if $ARGS[0] = 'reenable_condoms2':
 			act'Continue':gs 'sex_ev_condoms', 'npc_condom_use'
 		end
 		
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			act'Mine':
 				cla & *nl
 				'"Mine," you smile, happy that this didn''t have to be a big deal.'
@@ -1466,7 +1466,7 @@ if $ARGS[0] = 'reenable_condoms3':
 				cla & *nl
 				'"This isn''t up for debate," you insist. "It''s condoms or we can''t fuck anymore."'
 				'"Ugh, fine. But you need to bring them. I don''t have any."'
-				if prezik = 0:
+				if mc_inventory['equipped_condoms'] = 0:
 					act'Uh oh':
 						cla & *nl
 						'"Uhh..."'
@@ -1780,7 +1780,7 @@ if $ARGS[0] = 'need_condoms_today':
 				gs 'sex_ev_condoms', 'no_condom2'
 			end
 		end
-		if prezik > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			act'Use yours':
 				cla & *nl
 				'"Sorry," you say pulling out a condom from your stash. "We should use protection today."'
@@ -1875,7 +1875,7 @@ if $ARGS[0] = 'pc_dangerous_day_condom_insist':
 				gs 'sex_ev_condoms', 'npc_condom_put_on'
 			elseif npc_no_condoms[$boy] = 1 and npc_childfree[$boy] = 1:
 				'"Ugh fine..." he sighs. "But I don''t have any. We need to use yours."'
-				if prezik = 0:
+				if mc_inventory['equipped_condoms'] = 0:
 					'"I don''t have any..." you say reluctantly. "I thought you would."'
 					if npc_no_condoms_know[$boy] = 1:
 						'"I can''t imagine why you''d think that," he replies dryly. "You know I don''t use them."'
@@ -1896,7 +1896,7 @@ if $ARGS[0] = 'pc_dangerous_day_condom_insist':
 				act'Ask to use his':
 					cla & *clr
 					$sex_ev['bed_room']
-					if prezik > 0:
+					if mc_inventory['equipped_condoms'] > 0:
 						'"Could we use yours?" you ask and he immediately reaches over to grab one.'
 					else
 						'"I don''t have any on me. Can we use yours?" you ask and he immediately reaches over to grab one.'
@@ -1919,7 +1919,7 @@ if $ARGS[0] = 'pc_dangerous_day2':
 			act'Ask to use his':
 				cla & *clr
 				$sex_ev['bed_room']
-				if prezik > 0:
+				if mc_inventory['equipped_condoms'] > 0:
 					'"Could we use yours?" you ask and he immediately reaches for one.'
 				else
 					'"I don''t have any on me. Can we use yours?" you ask.'
@@ -2361,8 +2361,8 @@ end
 
 if $ARGS[0] = 'virgin_condom_pc_ask1':
 	gs 'willpower', 'sex', 'resist', 'medium'
-	if will_cost <= pcs_willpwr and (prezikcount + prezik > 0):
-!!	if prezikcount + prezik > 0:
+	if will_cost <= pcs_willpwr and (prezikcount + mc_inventory['equipped_condoms'] > 0):
+!!	if mc_inventory['normal_condoms'] + mc_inventory['equipped_condoms'] > 0:
 		
 		act'Pull out a condom (<<will_cost>> Willpower)':
 			cla & *clr
@@ -2483,15 +2483,15 @@ if $ARGS[0] = 'virgin_condom_ask2':
 		gs'sex_ev_condoms', 'virgin_condom2'
 	end
 	
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Get one from your bag':
 			sex_ev['using_pc_condoms'] = 1
 			gs 'sex_ev_condoms', 'pc_use_condoms'
 			cla & *clr
 			$sex_ev['bed_room']
-			if prezik > 1:
+			if mc_inventory['equipped_condoms'] > 1:
 				'"That''s okay, I''ve got some."'
-			elseif prezik = 1:
+			elseif mc_inventory['equipped_condoms'] = 1:
 				'"That''s okay, I''ve got one."'
 			end
 			if LudaQW['free_condoms'] = 1:
@@ -2623,7 +2623,7 @@ if $ARGS[0] = 'virgin_no_condom_shock1':
 end
 
 if $ARGS[0] = 'virgin_npc_doesnt_condom':
-	if prezik > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Use one of your condoms':
 			'"Fine! Here!" You fish through your bag and pull one out handing it to him.'
 			'While he rolls it on, you make sounds of annoyance, glaring at him.'

+ 3 - 3
locations/sex_ev_pillow_talk.qsrc

@@ -465,9 +465,9 @@ if $ARGS[0] = 'ran_out_of_condoms':
 			sex_ev['keep_it_up'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-			if sex_ev['out_of_condoms'] >= 1 and prezik = 0 and sex_ev['pc_condom_count'] ! 0 and sex_ev['condoms_used'] = 0:
+			if sex_ev['out_of_condoms'] >= 1 and mc_inventory['equipped_condoms'] = 0 and sex_ev['pc_condom_count'] ! 0 and sex_ev['condoms_used'] = 0:
 				'"I can''t believe how many condoms we went through," you say, looking around in awe at the discarded rubber sleeves littering the room. "You used up my <i>whole</i> stash!"'
-			elseif sex_ev['out_of_condoms'] >= 1 and prezik = 0 and sex_ev['pc_condom_count'] ! 0:
+			elseif sex_ev['out_of_condoms'] >= 1 and mc_inventory['equipped_condoms'] = 0 and sex_ev['pc_condom_count'] ! 0:
 				'"I can''t believe we used <i>all</i> our condoms," you say, looking around in awe at the discarded rubber sleeves littering the room. "Your stash and mine!"'
 			else
 				'"I can''t believe we used <i>all</i> your condoms," you say, looking around in awe at the discarded rubber sleeves littering the room.'
@@ -482,7 +482,7 @@ if $ARGS[0] = 'ran_out_of_condoms':
 			$sex_ev['convo'] = 'used_all_condoms'
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-			if sex_ev['out_of_condoms'] >= 1 and prezik = 0 and sex_ev['condoms_used'] = sex_ev['fuck_count']:
+			if sex_ev['out_of_condoms'] >= 1 and mc_inventory['equipped_condoms'] = 0 and sex_ev['condoms_used'] = sex_ev['fuck_count']:
 				'"You really need to buy more condoms," you sigh. "It really puts a damper on things if we can''t fuck safely."'
 				if npc_argumentative[$boy] > 0:
 					gs'sex_ev_pillow_talk', 'condom_buy_fight'

+ 1 - 1
locations/sex_ev_start.qsrc

@@ -397,7 +397,7 @@ if $ARGS[0] = 'fb_invited_start':
 				act'Undress':gt 'sex_ev_foreplay', 'undress'
 			end
 		end
-		if prezik > 0 and npc_bareback[$boy] = 0:
+		if mc_inventory['equipped_condoms'] > 0 and npc_bareback[$boy] = 0:
 			act'I brought condoms':
 				pc_buy_condoms[$boy] = 2
 				cla & *nl

+ 2 - 2
locations/stallion.qsrc

@@ -163,8 +163,8 @@ if $ARGS[0] = 'awaken':
 	if bag > 0: 
 		'Your handbag is sitting on top of the clothing. You check it for missing items.'
 		if money > 0: 'You have <<money>> rubles.'
-		if prezik + prezikcount + preziksabo > 0: 'All your condoms are missing.' & prezik = 0 & prezikcount = 0 & preziksabo = 0
-		if tabletki > 0: 'All your birth control pills are missing.' & tabletki = 0 & tabletkioddk = 0
+		if mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0: 'All your condoms are missing.' & mc_inventory['equipped_condoms'] = 0 & mc_inventory['normal_condoms'] = 0 & mc_inventory['sabotaged_condoms'] = 0
+		if mc_inventory['contraceptive_pill'] > 0: 'All your birth control pills are missing.' & mc_inventory['contraceptive_pill'] = 0 & tabletkioddk = 0
 	end
 	if broodcurse = 0: 
 		$temp = 'you''ll get another visit from me'

+ 2 - 2
locations/stat.qsrc

@@ -228,8 +228,8 @@ 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: prezikcount = prezik
-	if preziktype = 2: preziksabo = prezik
+	if preziktype = 0: mc_inventory['normal_condoms'] = prezik
+	if preziktype = 2: mc_inventory['sabotaged_condoms'] = prezik
 	prezik = 0
 	preziktype = 1
 end

+ 4 - 4
locations/stat_display.qsrc

@@ -259,7 +259,7 @@ else
 	$stat_lack_of_sleep_msg = ''
 end
 
-if tabletki = 0 and pillsleft[ptype] = 0:
+if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 	$stat_out_of_birth_control_msg = 'You need to buy more birth control pills'
 end
 
@@ -1104,7 +1104,7 @@ if cheatStatusIcons = 0:
 	end
 	
 	if menu_off = 0 and birth_control['remind_icon'] = 1:
-		if tabletki = 0 and pillsleft[ptype] = 0:
+		if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 			$statusIconBarTab += '<td><a href="exec:msg ''You are out of birth control pills!''"><img title="It''s time to take your birth control pill, but you are out of pills" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
 		else
 			$statusIconBarTab += '<td><a href="exec:gs ''din_bad'', ''quick_takepill''"><img title="It''s time to take your birth control pill!" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
@@ -2381,7 +2381,7 @@ elseif disable_LoadSave = 2:
 	$stat_msg += '<br><br><a href="exec:savegame ''quicksave.sav'' && pl''Quicksave Done''">Quick Save</a>  <a href="exec:savegame">Save</a>  <a href="exec:opengame">Load</a>  <a href="exec:if input(''Input Anything to confirm Quick Load'') ! null: opengame ''quicksave.sav''">Quick Load</a>'
 end
 
-if PillToggle = 1 and tabletki > 0:
+if PillToggle = 1 and mc_inventory['contraceptive_pill'] > 0:
 	Stabletki += tabletki
 	tabletki = 0
 elseif PillToggle = 0 and Stabletki > 0:
@@ -2389,7 +2389,7 @@ elseif PillToggle = 0 and Stabletki > 0:
 	Stabletki = 0
 end
 
-if CondomToggle = 1 and prezik > 0:
+if CondomToggle = 1 and mc_inventory['equipped_condoms'] > 0:
 	Sprezik += prezik
 	prezik = 0
 elseif CondomToggle = 0 and Sprezik > 0:

+ 9 - 9
locations/stol.qsrc

@@ -330,14 +330,14 @@ if $ARGS[0] = 'bc':
 	'In the drawer of your desk, you store your birth control.'
 	act 'Close the drawer':gt $loc, $loc_arg
 	act'Check your condoms':		
-		if prezik + prezikcount + preziksabo > 0:
+		if mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 			if $locclass = 'bedr':
 				*clr
 				'<center><img <<$set_imgh>> src="images/pc/items/accessories/birthcontrol/condoms.jpg"></center>'
 			end
-			if preziktype = 2 or preziksabo > 0:
-				'You have <<iif(preziktype = 2, prezikcount, prezikcount+prezik)>> normal, and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
-			elseif preziktype < 2 and preziksabo = 0:
+			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>'
+			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>'
 			end
 			*nl
@@ -351,17 +351,17 @@ if $ARGS[0] = 'bc':
 	end
 	
 	act'Check your birth control pills':
-		if tabletki > 0 or pillsleft[ptype] > 0:
+		if mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0:
 			if $locclass = 'bedr':
 				*clr
 				'<center><img <<$set_imgh>> src="images/pc/items/accessories/birthcontrol/bc_pills.jpg"></center>'
 			end
-			if tabletki > 0 and pillsleft[ptype] > 0:
-				'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
+			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:
 				'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> left.</b>'
-			elseif tabletki > 0 and pillsleft[ptype] = 0:
-				'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a>.'
+			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>.'
 			end
 		else
 			if $locclass = 'bedr':

+ 3 - 3
locations/uni_dorm.qsrc

@@ -606,11 +606,11 @@ if $ARGS[0] = 'dorm_room':
 	'To the left of the entrance is an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
 
-	if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
+	if mc_inventory['contraceptive_pill'] > 0 and mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
-	elseif tabletki > 0:
+	elseif mc_inventory['contraceptive_pill'] > 0:
 		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers.'
-	elseif prezik + prezikcount + preziksabo > 0:
+	elseif mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 		'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
 	end
 

+ 3 - 3
locations/unused/porn_view.qsrc

@@ -378,7 +378,7 @@ if seepornofut >= 10:
 				func('porn_view_strings', 'view_22_no_virgin_no_wdays')
 			end
 
-			if tabletki = 0 and prezik = 0:
+			if mc_inventory['contraceptive_pill'] = 0 and mc_inventory['equipped_condoms'] = 0:
 				func('porn_view_strings', 'view_22_no_pills')
 			end
 
@@ -498,7 +498,7 @@ if seepornofut >= 10:
 			if pcs_vag > 0:
 				func('porn_view_strings', 'view_22_no_virgin_no_wdays')
 
-				if tabletki = 0 and prezik = 0:
+				if mc_inventory['contraceptive_pill'] = 0 and mc_inventory['equipped_condoms'] = 0:
 					func('porn_view_strings', 'view_22_no_pills')
 				end
 
@@ -626,7 +626,7 @@ if seepornofut >= 10:
 		else
 			func('porn_view_strings', 'view_36_dp0')+func('porn_view_strings', 'view_36_dp'+iif(pcs_vag>=30,2,1))
 
-			if tabletki = 0 and prezik = 0:
+			if mc_inventory['contraceptive_pill'] = 0 and mc_inventory['equipped_condoms'] = 0:
 				func('porn_view_strings', 'view_cum_in_mind'+rand(0,2))
 			end
 

+ 9 - 9
locations/unused/porn_view_construct.qsrc

@@ -5,14 +5,14 @@ if $args[0] = 'vaginal':
 	:loop_bang
 	func('porn_view_strings', 'view_31_sex_next'+i)
 
-	if tabletki = 0 and prezik = 0:
+	if mc_inventory['contraceptive_pill'] = 0 and mc_inventory['equipped_condoms'] = 0:
 		func('porn_view_strings', 'view_31'+iif(rand(0,10)>(6+i),'_cum'+i,'_no_condom'))
 
 	else
-		if tabletki > 0:
+		if mc_inventory['contraceptive_pill'] > 0:
 			func('porn_view_strings', 'view_31_pills')
 
-		elseif prezik > 0:
+		elseif mc_inventory['equipped_condoms'] > 0:
 			func('porn_view_strings', 'view_31_condom')
 
 			dynamic $prezik
@@ -57,7 +57,7 @@ if $args[0] = 'random':
 			func('porn_view_strings', 'view_pose_4')
 		end
 
-		if tabletki = 0 and prezik = 0:
+		if mc_inventory['contraceptive_pill'] = 0 and mc_inventory['equipped_condoms'] = 0:
 			j = rand(0,10)
 			func('porn_view_strings', 'view_cum_on'+iif(j>(6+i),1,iif(i=0,2,5)))
 
@@ -66,10 +66,10 @@ if $args[0] = 'random':
 			end
 
 		else
-			if tabletki > 0:
+			if mc_inventory['contraceptive_pill'] > 0:
 				func('porn_view_strings', 'view_pills')
 
-			elseif prezik > 0:
+			elseif mc_inventory['equipped_condoms'] > 0:
 				func('porn_view_strings', 'view_condom')
 
 				dynamic $prezik
@@ -97,7 +97,7 @@ end
 if $args[0] = 'dp':
 	func('porn_view_strings', 'view_36_dp0')+func('porn_view_strings', 'view_36_dp1')
 
-	if tabletki = 0 and prezik = 0: 
+	if mc_inventory['contraceptive_pill'] = 0 and mc_inventory['equipped_condoms'] = 0: 
 		func('porn_view_strings', 'view_cum_in_mind'+rand(0,2))
 	end
 
@@ -110,10 +110,10 @@ if $args[0] = 'dp':
 end
 
 if $args[0] = 'cum_warning':
-	if tabletki = 0 and prezik = 0:
+	if mc_inventory['contraceptive_pill'] = 0 and mc_inventory['equipped_condoms'] = 0:
 		func('porn_view_strings', 'view_no_condom')
 
-	elseif tabletki > 0:
+	elseif mc_inventory['contraceptive_pill'] > 0:
 		func('porn_view_strings', 'view_pills')
 
 	end