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

glife.qproj

@@ -1017,6 +1017,7 @@
 		<Location name="uni_lessons_electivesev1"/>
 		<Location name="uni_events"/>
 		<Location name="uniutil"/>
+		<Location name="uni_set_npc_in_uni"/>
 	</Folder>
 	<Folder name="University Characters">
 		<Location name="vecher"/>

locations/Cheatmenu_din.qsrc

@@ -3388,11 +3388,11 @@ $cheatmenu['items'] = {
 		end
 
 		if bag = 1:
-			if umbrella = 0:
-				*pl 'Umbrella: <a href="exec:umbrella = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+			if mc_inventory['umbrella'] = 0:
+				*pl 'Umbrella: <a href="exec:mc_inventory[''umbrella''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 			end
-			if umbrella = 1:
-				*pl 'Umbrella: <a href="exec:umbrella = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+			if mc_inventory['umbrella'] = 1:
+				*pl 'Umbrella: <a href="exec:mc_inventory[''umbrella''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 			end
 		end
 	end
@@ -3403,7 +3403,7 @@ $cheatmenu['items'] = {
 	end
 	if showNarcoticsItems = 1:
 		'<a href = "exec: showNarcoticsItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
-		*pl 'Cigarettes: <a href="exec:siga=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<siga>> </b></a>'
+		*pl 'Cigarettes: <a href="exec:mc_inventory[''cigarettes'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''cigarettes'']>> </b></a>'
 		*pl 'Joints: <a href="exec:joint=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<joint>> </b></a>'
 		*pl 'Cocaine: <a href="exec:dur=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<dur>> </b></a>'
 		*pl 'Amphetamine: <a href="exec:amphetamine=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<amphetamine>> </b></a>'
@@ -3419,83 +3419,83 @@ $cheatmenu['items'] = {
 	if showSexItems = 1:
 		'<a href = "exec: showSexItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
 
-		if pornMagazine = 0:
-			*pl 'Porn magazine: <a href="exec:pornMagazine = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['mag_porn'] = 0:
+			*pl 'Porn magazine: <a href="exec:mc_inventory[''mag_porn''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if pornMagazine = 1:
-			*pl 'Porn magazine: <a href="exec:pornMagazine = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['mag_porn'] = 1:
+			*pl 'Porn magazine: <a href="exec:mc_inventory[''mag_porn''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		if vibrator = 0:
-			*pl 'Vibrator: <a href="exec:vibrator = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['vibe'] = 0:
+			*pl 'Vibrator: <a href="exec:mc_inventory[''vibe''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if vibrator = 1:
-			*pl 'Vibrator: <a href="exec:vibrator = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['vibe'] = 1:
+			*pl 'Vibrator: <a href="exec:mc_inventory[''vibe''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		if analplug = 0:
-			*pl 'Butt plug: <a href="exec:analplug = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['buttplug'] = 0:
+			*pl 'Butt plug: <a href="exec:mc_inventory[''buttplug''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if analplug = 1:
-			*pl 'Butt plug: <a href="exec:analplug = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['buttplug'] = 1:
+			*pl 'Butt plug: <a href="exec:mc_inventory[''buttplug''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		*pl '15cm suction dildo: <a href="exec:suction_dildo=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<suction_dildo>> </b></a>'
+		*pl '15cm suction dildo: <a href="exec:mc_inventory[''dildo_suction'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''dildo_suction'']>> </b></a>'
 
-		if strapon = 0:
-			*pl 'Strap-on harness: <a href="exec:strapon = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['strapon'] = 0:
+			*pl 'Strap-on harness: <a href="exec:mc_inventory[''strapon''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if strapon = 1:
-			*pl 'Strap-on harness: <a href="exec:strapon = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['strapon'] = 1:
+			*pl 'Strap-on harness: <a href="exec:mc_inventory[''strapon''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		if dildo = 0:
-			*pl '10cm dildo: <a href="exec:dildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['dildo_small'] = 0:
+			*pl '10cm dildo: <a href="exec:mc_inventory[''dildo_small''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if dildo = 1:
-			*pl '10cm dildo: <a href="exec:dildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['dildo_small'] = 1:
+			*pl '10cm dildo: <a href="exec:mc_inventory[''dildo_small''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		if middildo = 0:
-			*pl '15cm dildo: <a href="exec:middildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['dildo_normal'] = 0:
+			*pl '15cm dildo: <a href="exec:mc_inventory[''dildo_normal''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if middildo = 1:
-			*pl '15cm dildo: <a href="exec:middildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['dildo_normal'] = 1:
+			*pl '15cm dildo: <a href="exec:mc_inventory[''dildo_normal''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		if largedildo = 0:
-			*pl '20cm dildo: <a href="exec:largedildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['dildo_big'] = 0:
+			*pl '20cm dildo: <a href="exec:mc_inventory[''dildo_big''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if largedildo = 1:
-			*pl '20cm dildo: <a href="exec:largedildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['dildo_big'] = 1:
+			*pl '20cm dildo: <a href="exec:mc_inventory[''dildo_big''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		if bigdildo = 0:
-			*pl '25cm dildo: <a href="exec:bigdildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['dildo_large'] = 0:
+			*pl '25cm dildo: <a href="exec:mc_inventory[''dildo_large''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if bigdildo = 1:
-			*pl '25cm dildo: <a href="exec:bigdildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['dildo_large'] = 1:
+			*pl '25cm dildo: <a href="exec:mc_inventory[''dildo_large''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		if extradildo = 0:
-			*pl '30cm dildo: <a href="exec:extradildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['dildo_huge'] = 0:
+			*pl '30cm dildo: <a href="exec:mc_inventory[''dildo_huge''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if extradildo = 1:
-			*pl '30cm dildo: <a href="exec:extradildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['dildo_huge'] = 1:
+			*pl '30cm dildo: <a href="exec:mc_inventory[''dildo_huge''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		if superdildo = 0:
-			*pl '35cm dildo: <a href="exec:superdildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['dildo_enormous'] = 0:
+			*pl '35cm dildo: <a href="exec:mc_inventory[''dildo_enormous''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if superdildo = 1:
-			*pl '35cm dildo: <a href="exec:superdildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['dildo_enormous'] = 1:
+			*pl '35cm dildo: <a href="exec:mc_inventory[''dildo_enormous''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
-		if maddildo = 0:
-			*pl '40cm dildo: <a href="exec:maddildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+		if mc_inventory['dildo_gigantic'] = 0:
+			*pl '40cm dildo: <a href="exec:mc_inventory[''dildo_gigantic''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
-		if maddildo = 1:
-			*pl '40cm dildo: <a href="exec:maddildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+		if mc_inventory['dildo_gigantic'] = 1:
+			*pl '40cm dildo: <a href="exec:mc_inventory[''dildo_gigantic''] = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 	end
 	'</center>'

locations/JuliaMilHome.qsrc

@@ -701,7 +701,7 @@ end
 				!!'"What? How could she repay you if she doesn''t have any money?" Julia asks you.'
 				!!'"Well, she does know how to use that mouth of hers. I''ve been putting it to good use." You answer, blushing.'
 				!!'You notice Julia''s cheeks flushing red at this comment. She''s clearly getting aroused just by talking of this.'
-				!!if strapon = 1:
+				!!if mc_inventory['strapon'] = 1:
 					!!'"You know, I''ve bought myself a strap-on. I was planning to use it on Julia." You admit.'
 					!!'"If you''re up for it, you could get yourself one too and we can both have some fun with Julia." You offer.'
 					!!'"That does sound, uhm ..., like it could be a lot of fun." Julia responds, unconsciously rubbing her thighs together. "Ok, I''m in."'

locations/Katja_Tanga.qsrc

@@ -21,23 +21,23 @@ if $ARGS[0] = 'secretroom':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_10.jpg"></center>'
 			'After a few minutes of teasing her nipples, you kiss your way down to her stomach, pulling off her skirt as you do. Your lips descend down her body and you begin kissing and teasing her clit with your tongue. You pull her down and gentle push her down on her back. Once she''s comfortable, you slide two of your fingers into her wet pussy and begin to finger fuck her. She moans in pleasure she squeezes her breasts firmly in her hands.'
 			!!The requirements here are to make sure you own a dildo and that neither you or Katja has a hymen, since the scene does not acount for that possibility.
-			if (middildo = 1 or dildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1 or superdildo = 1 or maddildo = 1) and stat['think_virgin'] = 0 and npc_vag['A14'] > 0:
+			if (middildo = 1 or mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_big'] = 1 or mc_inventory['dildo_large'] = 1 or mc_inventory['dildo_huge'] = 1 or mc_inventory['dildo_enormous'] = 1 or mc_inventory['dildo_gigantic'] = 1) and stat['think_virgin'] = 0 and npc_vag['A14'] > 0:
 				act 'Get dildo':
 					if dildonumber > 0:
 						gs 'boyStat', 'D<<dildonumber>>'
-					elseif dildo = 1:
+					elseif mc_inventory['dildo_small'] = 1:
 						gs 'boyStat', 'D1'
-					elseif middildo = 1:
+					elseif mc_inventory['dildo_normal'] = 1:
 						gs 'boyStat', 'D2'
-					elseif largedildo = 1:
+					elseif mc_inventory['dildo_big'] = 1:
 						gs 'boyStat', 'D3'
-					elseif bigdildo = 1:
+					elseif mc_inventory['dildo_large'] = 1:
 						gs 'boyStat', 'D4'
-					elseif extradildo = 1:
+					elseif mc_inventory['dildo_huge'] = 1:
 						gs 'boyStat', 'D5'
-					elseif superdildo = 1:
+					elseif mc_inventory['dildo_enormous'] = 1:
 						gs 'boyStat', 'D6'
-					elseif maddildo = 1:
+					elseif mc_inventory['dildo_gigantic'] = 1:
 						gs 'boyStat', 'D7'
 					end 
 					

locations/MartinSex.qsrc

@@ -712,7 +712,7 @@ if $ARGS[0] = 'MartinTease3':
 				'You could certainly make him, and yourself, even happier, if you wanted to.'
 				'But at least part of the excitement you are feeling right now came from teasing Martin, from having control over the situation and over him. And, as cruel as that may be, what could possibly emphasize your power over him more than leaving him with blue balls?'
 
-				if dildo = 1 or middildo = 1 and bag > 0:
+				if mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_normal'] = 1 and bag > 0:
 					*nl
 					'Or... well, you could take your ''little friend'' out of your purse and take care of your own needs before deciding anything...'
 				end
@@ -755,7 +755,7 @@ if $ARGS[0] = 'MartinTease3':
 					act 'Leave the bar': gt 'city_industrial'
 				end
 
-				if dildo = 1 or middildo = 1 and bag > 0:
+				if mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_normal'] = 1 and bag > 0:
 					act 'Masturbate with your dildo':gt 'MartinSex','MartinTeaseDildo'
 				end
 			end
@@ -859,7 +859,7 @@ if $ARGS[0] = 'MartinTease4':
 					'You could certainly make him, and yourself, even happier, if you wanted to.'
 					'But at least part of the excitement you are feeling right now came from teasing Martin, from having control over the situation and over him. And, as cruel as that may be, what could possibly emphasize your power over him more than leaving him with blue balls?'
 
-					if dildo = 1 or middildo = 1 and bag > 0:
+					if mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_normal'] = 1 and bag > 0:
 						*nl
 						'Or... well, you could take your ''little friend'' out of your purse and take care of your own needs before deciding anything...'
 					end
@@ -903,7 +903,7 @@ if $ARGS[0] = 'MartinTease4':
 						act 'Leave the bar': gt 'city_industrial'
 					end
 
-					if dildo = 1 or middildo = 1 and bag > 0:
+					if mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_normal'] = 1 and bag > 0:
 						act 'Masturbate with your dildo':gt 'MartinSex','MartinTeaseDildo'
 					end
 				end

locations/albina_wine_event.qsrc

@@ -864,7 +864,7 @@ if $ARGS[0] = 'masturbate_answer2':
 		gs 'albina_wine_event','wine_chat2'
 	end
 	
-	if stat['vaginal_dildo'] > 0 and dildo >= 1:
+	if stat['vaginal_dildo'] > 0 and mc_inventory['dildo_small'] >= 1:
 		act 'Dildo':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'

locations/artemhome.qsrc

@@ -1712,7 +1712,7 @@ if $ARGS[0] = 'chat':
 				act 'Wait for Anushka': gt 'artem_sex', 'anushka_3some'
 			end
 		end
-		if artemQW['anal'] >= 1 and strapon = 1 and strapnumber > 0 and artemQW[strapon] = 0:
+		if artemQW['anal'] >= 1 and mc_inventory['strapon'] = 1 and strapnumber > 0 and artemQW[strapon] = 0:
 			act 'Is Artem really kinky':
 				*clr & cla
 				minut += 1

locations/balkon2.qsrc

@@ -129,7 +129,7 @@ if $ARGS[0] = 'masopt':
 	pcs_mood += 15
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_dildo.jpg"></center>'
 
-	if dildo = 1:
+	if mc_inventory['dildo_small'] = 1:
 		act 'Rub your clit with the dildo':
 			*clr & cla
 			pcs_vag += rand(0, 2)

locations/bed.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'mast':
 	pcs_vag += 1
 
 	if husband > 0 and STRPOS('bedr,bedr2x,korr,korr2x',$loc) > 0 and husbandrink ! 10:
-		if dildo > 0:
+		if mc_inventory['dildo_small'] > 0:
 			if week > 5 or (week < 6 and hour > 16):
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m21.jpg"></center>'

locations/bed2.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = '':
 	end
 	*nl
 
-	if analplug = 1 :
+	if mc_inventory['buttplug'] = 1 :
 		if bedAnal = 0:
 			'Should you always remove your anal plug before bed? Currently - <a href="exec:bedAnal = 1 & gs ''stat'' & gt ''bed2''">NO</a>.'
 		elseif bedAnal = 1:
@@ -42,7 +42,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if vibrator = 1 and cheatVib = 1:
+	if mc_inventory['vibe'] = 1 and cheatVib = 1:
 		if bedVibrator = 0:
 			'Should you always remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 1 & gs ''stat'' & gt ''bed2''">NO</a>.'
 		elseif bedVibrator = 1:
@@ -66,7 +66,7 @@ if $ARGS[0] = '':
 
 	if $loc = 'bedrPar':
 		if locat['Anya_inroom'] = 0 or locat['Anya'] = 1 or locat['Anya'] = 26:
-			if pornMagazine > 0:gs 'events', 'read_porn'
+			if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
 			if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and fame['pav_slut'] >= 150) or (pcs_horny > 50 and fame['pav_slut'] >= 50 and pcs_inhib >= 60):
 				act 'Masturbate':
 					InSleep = 0
@@ -75,7 +75,7 @@ if $ARGS[0] = '':
 			end
 		end
 	else
-		if pornMagazine > 0:gs 'events', 'read_porn'
+		if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
 		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and fame['pav_slut'] >= 150) or (pcs_horny > 50 and fame['pav_slut'] >= 50 and pcs_inhib >= 60):
 			act 'Masturbate':
 				InSleep = 0

locations/bedr.qsrc

@@ -121,7 +121,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 	'<<$husName>> came home drunk and fell asleep on the bed.'
 	'<i>That pig</i>! you think when an idea springs to mind. <i>Maybe I should teach him a lesson so he won''t get drunk again</i>.'
 
-	if analplug = 1:
+	if mc_inventory['buttplug'] = 1:
 		act 'Insert a butt plug in his ass':
 			*clr & cla
 			menu_off = 1
@@ -135,7 +135,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 
 			'<<$husName>> moves, but he doesn''t wake up.'
 
-			if dildo > 0:
+			if mc_inventory['dildo_small'] > 0:
 				act 'Insert a dildo into his ass':
 					*clr & cla
 					menu_off = 1
@@ -154,7 +154,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 				end
 			end
 
-			if strapon > 0:
+			if mc_inventory['strapon'] > 0:
 				act 'Use the strap-on':
 					*clr & cla
 					menu_off = 1
@@ -200,7 +200,7 @@ dynamic $palelady
 
 if pcs_horny >= 50: act 'Masturbate': gt 'selfplay', 'start'
 
-if pornMagazine > 0:
+if mc_inventory['mag_porn'] > 0:
 	'You hide a porn magazine under your mattress.'
 	gs 'events', 'read_porn'
 end

locations/bedr2x.qsrc

@@ -112,7 +112,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 	'<<$husName>> came home very drunk and collapsed on the bed. He fell asleep in his clothes.'
 	'<i>That pig</i>! you think when an idea springs to mind. <i>Maybe I should teach him a lesson so he won''t get drunk again</i>.'
 
-	if analplug = 1:
+	if mc_inventory['buttplug'] = 1:
 		act 'Insert an anal plug':
 			*clr & cla
 			menu_off = 1
@@ -125,7 +125,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 			if analplugin = 0: 'You take an anal plug and put it into his ass.'
 			'<<$husName>> moves, but he doesn''t wake up.'
 
-			if dildo > 0:
+			if mc_inventory['dildo_small'] > 0:
 				act 'Insert dildo':
 					*clr & cla
 					menu_off = 1
@@ -144,7 +144,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 				end
 			end
 
-			if strapon > 0:
+			if mc_inventory['strapon'] > 0:
 				act 'Wear strap-on':
 					*clr & cla
 					menu_off = 1
@@ -189,7 +189,7 @@ dynamic $palelady
 
 if pcs_horny >= 50: act 'Masturbate': gt 'selfplay', 'start'
 
-if pornMagazine > 0:
+if mc_inventory['mag_porn'] > 0:
 	'You have hidden a porn magazine under your mattress.'
 	gs 'events', 'read_porn'
 end

locations/bedrPar.qsrc

@@ -21,9 +21,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		'<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:
 			gt 'mother', 'condom_find'
-		elseif dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
+		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'
-		elseif analplug = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
+		elseif mc_inventory['buttplug'] = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
 			gt 'mother', 'plug_find'
 		else
 			'You walk into your bedroom and find your mother sweeping and dusting the room, folding clothes and putting them away and making the beds.'
@@ -91,7 +91,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if $home['current'] = 'parents_home':
 			'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 			*nl
-			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '.')+' Your sister''s bed is in the other corner.'
+			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(mc_inventory['strapon'] = 1, '. You keep your strapon inside it.', '.')+' Your sister''s bed is in the other corner.'
 		else
 			'This small bedroom you used to share with your sister, Anya. The furniture is old and basic.'
 		end
@@ -195,12 +195,12 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			act 'Open wardrobe': gt 'wardrobe', 'start'
 			gs 'prostitution_functions', 'prostitute_outfit_at_home'
 			
-			if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
+			if mc_inventory['mag_porn'] > 0:'You have hidden your porn magazines under the mattress of your bed.'
 			!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
 			sis_watch = 0
 
 			if locat['Anya_inroom'] = 0 or sisboytrio > 0:
-				if pornMagazine > 0:gs 'events', 'read_porn'
+				if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
 				if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
 					act 'Send Rex a text message': gt 'rex_events','sms'
 				end

locations/billiard.qsrc

@@ -30,7 +30,7 @@ if hour >= 8 and hour <= 20:
 
 				if money >= 1000:act 'Bet on the game (1000 <b>₽</b>)':billvar = 0 & gt 'billiard', 'randwin'
 
-				if strapon = 1:act 'Play for his ass, sex if you lose':billvar = 1 & gt 'billiard', 'randwin'
+				if mc_inventory['strapon'] = 1:act 'Play for his ass, sex if you lose':billvar = 1 & gt 'billiard', 'randwin'
 				
 				gs 'willpower', 'anal', 'resist'
 				if will_cost <= pcs_willpwr:
@@ -56,7 +56,7 @@ if hour >= 8 and hour <= 20:
 
 				if money >= 1000:act 'Bet on the game (1000 <b>₽</b>)':billvar = 0 & gt 'billiard', 'randwin'
 
-				if strapon = 1:act 'Play for their asses, sex if you lose':billvar = 2 & gt 'billiard', 'randwin'
+				if mc_inventory['strapon'] = 1:act 'Play for their asses, sex if you lose':billvar = 2 & gt 'billiard', 'randwin'
 
 				gs 'willpower', 'anal', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:

locations/brother2.qsrc

@@ -73,9 +73,9 @@ if $ARGS[0] = 'chat':
 		elseif seepornofut >= 1:
 			'"Pfft! More like you want more time to watch porn with them!" you laugh scoffingly.'
 			*nl
-			if pornMagazine = 0:
+			if mc_inventory['mag_porn'] = 0:
 				'"We play football too!" Kolka protests while you tease him with a silly face and fake jerk off motions.'
-			elseif pornMagazine > 0:
+			elseif mc_inventory['mag_porn'] > 0:
 				'"We play football too!" Kolka protests while you tease him with silly face and fake jerk off motions. "Hrmph! You''re one to talk anyways," he grumbles. "I know about that magazine you hide under your bed."'
 				*nl
 				'"I don''t know what you''re talking about," you say with an air of feigned innocence and superiority. "I have never been anything other than ladylike!"'

locations/city_house_res_bedr.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'bedro':
 
 	act 'Relax on your bed': gt 'bed', 'start'
 
-	if pornMagazine > 0:gs 'events', 'read_porn'
+	if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
 	
 	if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
 	gs 'music_actions', 'music_icon'
@@ -31,7 +31,7 @@ if $ARGS[0] = 'bedro':
 	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>.'
 	*nl
 	'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
-	if pornMagazine > 0:'You have hidden your porn magazine in your nightstand.'
+	if mc_inventory['mag_porn'] > 0:'You have hidden your porn magazine in your nightstand.'
 	*nl
 	'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'

locations/city_house_res_misc.qsrc

@@ -78,7 +78,7 @@ if $ARGS[0] = 'hallw':
 	'The main hallway of your house. You can visit the different rooms from here.'
 	'There''s a <a href="exec:gt ''mirror'', ''start''">mirror</a> hanging on the wall.'
 	
-	if umbrella > 0:'There''s an umbrella hanging on a hook by the door.'
+	if mc_inventory['umbrella'] > 0:'There''s an umbrella hanging on a hook by the door.'
 	
 	act 'Go to your bedroom': gt 'city_house_res_bedr', 'bedro'
 	act 'Go to your bathroom': gt 'city_house_res_bathr', 'bathr'

locations/city_mansion_residence_1.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'yfoyer':
 	if ymanrem[3] >= 1:
 		'The main hall of Matryona Mansion. You can visit the different rooms in the mansion from here.'
 		'There''s a <a href="exec:gt ''mirror'', ''start''">mirror</a> hanging on the wall.'
-		if umbrella > 0:'There''s an umbrella hanging on a hook by the door.'
+		if mc_inventory['umbrella'] > 0:'There''s an umbrella hanging on a hook by the door.'
 		act 'Go to your bedroom': gt 'city_mansion_residence_1', 'ybedroom'
 		act 'Go to your bathroom': gt 'city_mansion_residence_1', 'ybathroom'
 		act 'Go to your kitchen': gt 'city_mansion_residence_1', 'ykitchen'
@@ -99,7 +99,7 @@ if $ARGS[0] = 'ybedroom':
 	act 'Relax on your bed': gt 'bed', 'start'
 	gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
-	if pornMagazine > 0:gs 'events', 'read_porn'
+	if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
 
 	if pcs_horny >= 50:
 		act 'Masturbate':gt 'selfplay', 'start'
@@ -110,7 +110,7 @@ if $ARGS[0] = 'ybedroom':
 		'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>.'
 		*nl
 		'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
-		if pornMagazine > 0:'You have hidden your porn magazine in your nightstand.'
+		if mc_inventory['mag_porn'] > 0:'You have hidden your porn magazine in your nightstand.'
 		*nl
 		'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	end

locations/city_nightclub.qsrc

@@ -937,7 +937,7 @@ if $ARGS[0] = 'bar0':
 					gs 'arousal', 'cuni', 5, 'lesbian'
 					gs 'stat'
 
-					if middildo = 0 and dildo = 0 and largedildo = 0 and bigdildo = 0 and extradildo = 0 and superdildo = 0 and maddildo = 0:
+					if mc_inventory['dildo_normal'] = 0 and mc_inventory['dildo_small'] = 0 and mc_inventory['dildo_big'] = 0 and mc_inventory['dildo_large'] = 0 and mc_inventory['dildo_huge'] = 0 and mc_inventory['dildo_enormous'] = 0 and mc_inventory['dildo_gigantic'] = 0:
 						*clr & cla
 						'Now with the adrenaline fading away, both of you begin to blush when you remember that you did this in front of audience. Both of you quickly get dressed and go your separate ways.'
 

locations/din_bad.qsrc

@@ -234,9 +234,9 @@ if $ARGS[0] = 'd_bag':
 	end
 	if mc_inventory['food_water'] > 0: 'There''s a bottle of water in your purse. <a href="exec:mc_inventory[''food_water''] = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
 	if mc_inventory['food_sandwich'] > 0: 'There''s a sandwich in your purse. <a href="exec:mc_inventory[''food_sandwich''] = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Eat</a>'
-	if strapon = 1 and strapnumber = 0:
-		'You have a strapon harness in your purse, but you don''t have a dildo attached to it'+iif(dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0, '. You keep your dildos in your desk at home.', ', because you don''t own one.')
-	elseif strapon = 1 and strapnumber ! 0:
+	if mc_inventory['strapon'] = 1 and strapnumber = 0:
+		'You have a strapon harness in your purse, but you don''t have a dildo attached to it'+iif(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, '. You keep your dildos in your desk at home.', ', because you don''t own one.')
+	elseif mc_inventory['strapon'] = 1 and strapnumber ! 0:
 		'You have a strapon harness in your purse and a <<(strapnumber +1)*5>>cm attached to it.'
 	end
 	if mc_inventory['food_wine'] = 1 and alkowine = 0:'There''s a bottle of <a href="exec:dynamic $dinalkowin1">wine</a> in your purse.'

locations/din_van.qsrc

@@ -922,7 +922,7 @@ $enema = {
 }
 
 $toymanage = {
-	if analplug = 1 and analplugin = 1:
+	if mc_inventory['buttplug'] = 1 and analplugin = 1:
 		act 'Remove your butt plug (0:05)':
 			menu_off = 1
 			cla
@@ -938,7 +938,7 @@ $toymanage = {
 
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
-	elseif analplug = 1 and analplugin = 0:
+	elseif mc_inventory['buttplug'] = 1 and analplugin = 0:
 		act 'Insert your butt plug (0:05)':
 			menu_off = 1
 			cla
@@ -959,7 +959,7 @@ $toymanage = {
 		end
 	end
 
-	if vibrator = 1 and vibratorIN = 1:
+	if mc_inventory['vibe'] = 1 and vibratorIN = 1:
 		act 'Remove the vibrator (0:05)':
 			menu_off = 1
 			cla
@@ -975,7 +975,7 @@ $toymanage = {
 
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
+	elseif mc_inventory['vibe'] = 1 and vibratorIN = 0 and pcs_vag ! 0:
 		act 'Insert the vibrator in your vagina (0:05)':
 			menu_off = 1
 			cla

locations/events.qsrc

@@ -217,7 +217,7 @@ if $ARGS[0] = 'read':
 	end
 
 
-	if cookmag = 0 and fashmag = 0 and compmag = 0 and biomag = 0 and knitmag = 0 and fitmag = 0:
+	if mc_inventory['mag_cooking'] = 0 and mc_inventory['mag_fashion'] = 0 and mc_inventory['mag_computer'] = 0 and mc_inventory['mag_biography'] = 0 and mc_inventory['mag_knitting'] = 0 and mc_inventory['mag_fitness'] = 0:
 		'You have no magazines to read.'
 	else
 		act 'Read a magazine':
@@ -233,14 +233,14 @@ if $ARGS[0] = 'read':
 				'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_magazine_dressed.jpg"></center>'
 			end
 			
-			if cookmag = 1:
+			if mc_inventory['mag_cooking'] = 1:
 				act 'Read your cooking magazine':
 					if blizoruk = 500 or glassqw = 1:
 						glassqw = 1
 						msg'	The text blurs across the page, it seems you have poor eyesight. Maybe you should visit an ophthalmologists.'&gt $loc, $loc_arg
 					end
 					cla & *nl
-					cookmag = 0
+					mc_inventory['mag_cooking'] = 0
 					pcs_mood += 5
 					minut += 30
 					'You relax for half an hour reading your cooking magazine.'
@@ -248,14 +248,14 @@ if $ARGS[0] = 'read':
 				end
 			end
 
-			if fashmag = 1:
+			if mc_inventory['mag_fashion'] = 1:
 				act 'Read your fashion magazine':
 					if blizoruk = 500 or glassqw = 1:
 						glassqw = 1
 						msg'	The text blurs across the page, it seems you have poor eyesight. Maybe you should visit an ophthalmologists.'&gt $loc, $loc_arg
 					end
 					cla & *nl
-					fashmag = 0
+					mc_inventory['mag_fashion'] = 0
 					pcs_mood += 5
 					minut += 30
 					gs 'exp_gain', 'makupskl', 1
@@ -264,14 +264,14 @@ if $ARGS[0] = 'read':
 				end
 			end
 
-			if compmag = 1:
+			if mc_inventory['mag_computer'] = 1:
 				act 'Read your computing magazine':
 					if blizoruk = 500 or glassqw = 1:
 						glassqw = 1
 						msg'	The text blurs across the page, it seems you have poor eyesight. Maybe you should visit an ophthalmologists.'&gt $loc, $loc_arg
 					end
 					cla & *nl
-					compmag = 0
+					mc_inventory['mag_computer'] = 0
 					pcs_mood += 5
 					minut += 30
 					gs 'exp_gain', 'compskl', 1 
@@ -280,14 +280,14 @@ if $ARGS[0] = 'read':
 				end
 			end
 
-			if biomag = 1:
+			if mc_inventory['mag_biography'] = 1:
 				act 'Read your biographical magazine':
 					if blizoruk = 500 or glassqw = 1:
 						glassqw = 1
 						msg'	The text blurs across the page, it seems you have poor eyesight. Maybe you should visit an ophthalmologists.'&gt $loc, $loc_arg
 					end
 					cla & *nl
-					biomag = 0
+					mc_inventory['mag_biography'] = 0
 					pcs_mood += 5
 					minut += 30
 					'You relax for half an hour reading your biographical magazine.'
@@ -295,14 +295,14 @@ if $ARGS[0] = 'read':
 				end
 			end
 
-			if knitmag = 1:
+			if mc_inventory['mag_knitting'] = 1:
 				act 'Read your knitting magazine':
 					if blizoruk = 500 or glassqw = 1:
 						glassqw = 1
 						msg'	The text blurs across the page, it seems you have poor eyesight. Maybe you should visit an ophthalmologists.'&gt $loc, $loc_arg
 					end
 					cla & *nl
-					knitmag = 0
+					mc_inventory['mag_knitting'] = 0
 					pcs_mood += 5
 					minut += 30
 					if pcs_sewng <= 100: gs 'exp_gain', 'sewng', rand(1,3)
@@ -311,14 +311,14 @@ if $ARGS[0] = 'read':
 				end
 			end
 
-			if fitmag = 1:
+			if mc_inventory['mag_fitness'] = 1:
 				act 'Read your fitness magazine':
 					if blizoruk = 500 or glassqw = 1:
 						glassqw = 1
 						msg'	The text blurs across the page, it seems you have poor eyesight. Maybe you should visit an ophthalmologists.'&gt $loc, $loc_arg
 					end
 					cla & *nl
-					fitmag = 0
+					mc_inventory['mag_fitness'] = 0
 					pcs_mood += 5
 					minut += 30
 					'You relax for half an hour reading your fitness magazine.'
@@ -340,10 +340,10 @@ if $ARGS[0] = 'read_porn':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/magazines/porn.jpg"></center>'
 
-		if pornMagazine = 1:
+		if mc_inventory['mag_porn'] = 1:
 			'<font color="magenta">Boring</font>, you''ve memorized this magazine by heart, you think that is time to buy a new one.'
 		else
-			pornMagazine -= 1
+			mc_inventory['mag_porn'] -= 1
 			pcs_horny += 10
 			minut += 5
 			gs 'stat'

locations/gas_station_gp_117.qsrc

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

locations/hookup_after.qsrc

@@ -1269,7 +1269,7 @@ if $ARGS[0] = 'pre':
 			gs 'hookup_after', 'start'
 		end
 		
-		if siga > 0 and hookup['cigarette'] = 0:
+		if mc_inventory['cigarettes'] > 0 and hookup['cigarette'] = 0:
 			act'Have a smoke':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
@@ -1413,7 +1413,7 @@ if $ARGS[0] = 'start':
 	elseif npc_smoker[$boy] > 0 and hookup['cigarette'] = 2:
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
-		siga += 1
+		mc_inventory['cigarettes'] += 1
 		siga_bum = 1
 		gs 'drugs', 'smoke'
 		'The two of you lay back and relax, enjoying a post-fuck smoke together as you wind down.'

locations/igorev.qsrc

@@ -180,7 +180,7 @@ if $ARGS[0] = 'kiss':
 				act 'Crossdress sex (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		if strapon >= 1:
+		if mc_inventory['strapon'] >= 1:
 			act'Take out the strap-on': gt 'igorev', 'strap on'
 		end
 	end
@@ -336,7 +336,7 @@ if $ARGS[0] = 'din_krossdresssex':
 				'You''re so turned on, you can''t resist any longer. You lean forward and start making out with him.'
 				gs 'arousal', 'kiss', 5
 				gs 'stat'
-				if strapon > 0:
+				if mc_inventory['strapon'] > 0:
 					act 'You have a strapon': gt 'igorev', 'strapon_crossdress'
 				end
 				act 'Ask Igor to lick your pussy':
@@ -843,7 +843,7 @@ if $ARGS[0] = 'din_sisterkom_krossdress':
 												'You are startled by his appearance. Not expecting him to look this good. You''re getting wet and you can''t resist any longer. You lean forward and start making out with him.'
 												gs 'arousal', 'kiss', 10
 												gs 'stat'
-												if strapon > 0:
+												if mc_inventory['strapon'] > 0:
 													act 'You have a strapon': gt 'igorev', 'strapon_crossdress'
 												end
 												act 'Push him onto the bed':
@@ -958,7 +958,7 @@ if $ARGS[0] = 'caught':
 				'He is silent for a moment and then shrugs. "I don''t really know, one day I was home alone and bored. I went into my sisters room and seen all those clothes and I suddenly had an urge to try them on. So I did and it felt great. I guess I have always been curious what it would be like to be a girl."'
 				'Nodding a bit you reply to him. "I can see that, we are all trying to figure out who we are going to be.'
 				'He offers a faint smile. "Yeah, I guess I just wish I was a girl instead."'
-				if strapon > 0:
+				if mc_inventory['strapon'] > 0:
 					act 'You have a strapon': gt 'igorev', 'strap on'
 				end
 				act 'Let''s go for a walk': gt 'igorev', 'crossdress_walk1'
@@ -1070,7 +1070,7 @@ if $ARGS[0] = 'help_crossdress':
 					'Igor quickly changes back to his normal clothes and then practically skips over. "Of course."'
 					act 'Chat': gt 'igorhome', 'chat'
 				end
-				if strapon > 0:
+				if mc_inventory['strapon'] > 0:
 					act 'You have a strapon': gt 'igorev', 'strapon_crossdress'
 				end
 			end

locations/igorhome.qsrc

@@ -252,7 +252,7 @@ if $ARGS[0] = 'chat':
 			end
 		end
 	end
-	if strapon > 0 and igorstrap = 1:
+	if mc_inventory['strapon'] > 0 and igorstrap = 1:
 		act 'Be my bitch': gt 'igorev', 'strap on'
 	end
 	!!this only shows up if Sveta knows Igor cross dresses.

locations/intro_city_select.qsrc

@@ -1460,7 +1460,7 @@ if $ARGS[0] = 'goth':
 		currentpursenumber = 18
 		dolls_purses[18] = 1
 		bag = 1
-		umbrella = 1
+		mc_inventory['umbrella'] = 1
 		money -= 1000
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'rus', 55

locations/intro_initialization.qsrc

@@ -4,6 +4,10 @@
 !!	Top area for things that need to be done before setting the variables for either start
 year = 2016
 
+!! Set npc_in_uni variables for the standard uni NPCs
+gs 'uni_set_npc_in_uni', 'other'
+
+
 BDSMfilm = 0
 pornstudio = 0
 pfilmSTOP = 0

locations/intro_initialization_city.qsrc

@@ -9,7 +9,15 @@ if mid($start_type,1,3) ! 'uni':
 	day = 4
 	week = 2
 	hour = 13
+	
+	!! Set npc_in_uni variables for the standard uni NPCs
+	gs 'uni_set_npc_in_uni', 'other'
+
+else
+	!! Set npc_in_uni variables for standard uni NPCs + pav uni NPCs
+	gs 'uni_set_npc_in_uni', 'all'
 end
+
 year = 2017
 
 BDSMfilm = 0

locations/intro_sg_select.qsrc

@@ -1641,7 +1641,7 @@ if $ARGS[0] = 'goth':
 		currentpursenumber = 18
 		dolls_purses[18] = 1
 		bag = 1
-		umbrella = 1
+		mc_inventory['umbrella'] = 1
 		money -= 1000
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'rus', 55

locations/intro_sg_tg.qsrc

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

locations/item_stock_db.qsrc

@@ -146,7 +146,7 @@ if $ARGS[0] = 'beauty':
 
     item_idx = 13
     $item_curr_aisle['<<item_idx>>'] = 'Hair pins' 
-    $var_curr_aisle['<<item_idx>>'] = 'bobbypins'
+    $var_curr_aisle['<<item_idx>>'] = 'kirbygrips'
     $desc_curr_aisle['<<item_idx>>'] = 'The old classic bobby pins for when you want to go the extra mile with hairstyles.'
     quantity_curr_aisle['<<item_idx>>'] = 10
 	max_curr_aisle['<<item_idx>>'] = 0
@@ -232,7 +232,7 @@ if $ARGS[0] = 'food':
     $var_curr_aisle['<<item_idx>>'] = 'food_water'
     $desc_curr_aisle['<<item_idx>>'] = 'A bottle of water to quench your thirst.'
     quantity_curr_aisle['<<item_idx>>'] = 1
-    max_curr_aisle['<<item_idx>>'] = 0
+    max_curr_aisle['<<item_idx>>'] = 1
     cost_curr_aisle['<<item_idx>>'] = 100
     $img_curr_aisle['<<item_idx>>'] = ''
 
@@ -241,7 +241,7 @@ if $ARGS[0] = 'food':
     $var_curr_aisle['<<item_idx>>'] = 'food_sandwich'
     $desc_curr_aisle['<<item_idx>>'] = 'A sandwich to fill those hunger cravings.'
     quantity_curr_aisle['<<item_idx>>'] = 1
-    max_curr_aisle['<<item_idx>>'] = 0
+    max_curr_aisle['<<item_idx>>'] = 1
     cost_curr_aisle['<<item_idx>>'] = 100
     $img_curr_aisle['<<item_idx>>'] = ''
 
@@ -422,7 +422,7 @@ if $ARGS[0] = 'kiosk':
 	$item_curr_aisle['<<item_idx>>'] = 'Cigarettes' 
 	$var_curr_aisle['<<item_idx>>'] = 'cigarettes'
 	$desc_curr_aisle['<<item_idx>>'] = 'Paper-wrapped tobacco for smoking, containing nicotine and harmful chemicals.'
-	quantity_curr_aisle['<<item_idx>>'] = 1
+	quantity_curr_aisle['<<item_idx>>'] = 20
 	max_curr_aisle['<<item_idx>>'] = 0
 	cost_curr_aisle['<<item_idx>>'] = 115
 	$img_curr_aisle['<<item_idx>>'] = ''
@@ -432,7 +432,7 @@ if $ARGS[0] = 'kiosk':
 	$var_curr_aisle['<<item_idx>>'] = 'mag_fashion'
 	$desc_curr_aisle['<<item_idx>>'] = 'Glossy publications showcasing the latest trends, clothing, accessories, beauty tips, and celebrity styles, offering inspiration and insights for fashion enthusiasts.'
 	quantity_curr_aisle['<<item_idx>>'] = 1
-	max_curr_aisle['<<item_idx>>'] = ''
+	max_curr_aisle['<<item_idx>>'] = 1
 	cost_curr_aisle['<<item_idx>>'] = 150
 	$img_curr_aisle['<<item_idx>>'] = ''
 	
@@ -441,7 +441,7 @@ if $ARGS[0] = 'kiosk':
 	$var_curr_aisle['<<item_idx>>'] = 'mag_computer'
 	$desc_curr_aisle['<<item_idx>>'] = 'Trendy tech publications featuring hardware, software, and industry insights for tech enthusiasts.'
 	quantity_curr_aisle['<<item_idx>>'] = 1
-	max_curr_aisle['<<item_idx>>'] = 0
+	max_curr_aisle['<<item_idx>>'] = 1
 	cost_curr_aisle['<<item_idx>>'] = 150
 	$img_curr_aisle['<<item_idx>>'] = ''
 	
@@ -450,7 +450,7 @@ if $ARGS[0] = 'kiosk':
 	$var_curr_aisle['<<item_idx>>'] = 'mag_biography'
 	$desc_curr_aisle['<<item_idx>>'] = 'Publications featuring in-depth profiles and life stories of notable individuals, offering inspiration and insight into their lives.'
 	quantity_curr_aisle['<<item_idx>>'] = 1
-	max_curr_aisle['<<item_idx>>'] = 0
+	max_curr_aisle['<<item_idx>>'] = 1
 	cost_curr_aisle['<<item_idx>>'] = 150
 	$img_curr_aisle['<<item_idx>>'] = ''
 		
@@ -459,7 +459,7 @@ if $ARGS[0] = 'kiosk':
 	$var_curr_aisle['<<item_idx>>'] = 'mag_cooking'
 	$desc_curr_aisle['<<item_idx>>'] = 'Culinary publications filled with recipes, cooking tips, food photography, and gastronomic inspiration for home chefs and food enthusiasts.'
 	quantity_curr_aisle['<<item_idx>>'] = 1
-	max_curr_aisle['<<item_idx>>'] = 0
+	max_curr_aisle['<<item_idx>>'] = 1
 	cost_curr_aisle['<<item_idx>>'] = 150
 	$img_curr_aisle['<<item_idx>>'] = ''
 		
@@ -468,7 +468,7 @@ if $ARGS[0] = 'kiosk':
 	$var_curr_aisle['<<item_idx>>'] = 'mag_knitting'
 	$desc_curr_aisle['<<item_idx>>'] = 'A publication filled with knitting patterns, techniques, and creative ideas for knitting enthusiasts.'
 	quantity_curr_aisle['<<item_idx>>'] = 1
-	max_curr_aisle['<<item_idx>>'] = 0
+	max_curr_aisle['<<item_idx>>'] = 1
 	cost_curr_aisle['<<item_idx>>'] = 150
 	$img_curr_aisle['<<item_idx>>'] = ''
 		
@@ -477,7 +477,7 @@ if $ARGS[0] = 'kiosk':
 	$var_curr_aisle['<<item_idx>>'] = 'mag_fitness'
 	$desc_curr_aisle['<<item_idx>>'] = 'A publication offering workout routines, nutrition advice, and health tips for those seeking an active and healthy lifestyle.'
 	quantity_curr_aisle['<<item_idx>>'] = 1
-	max_curr_aisle['<<item_idx>>'] = 0
+	max_curr_aisle['<<item_idx>>'] = 1
 	cost_curr_aisle['<<item_idx>>'] = 150
 	$img_curr_aisle['<<item_idx>>'] = ''
 		
@@ -539,7 +539,7 @@ end
 
 	item_idx = 6
 	$item_curr_aisle['<<item_idx>>'] = 'Strap-on harness'
-	$var_curr_aisle['<<item_idx>>'] = 'harness'
+	$var_curr_aisle['<<item_idx>>'] = 'strapon'
 	$desc_curr_aisle['<<item_idx>>'] = 'A strap-on harness securely holds a dildo for hands-free pleasure.'
 	$quantity_curr_aisle['<<item_idx>>'] = 1
 	$max_curr_aisle['<<item_idx>>'] = 1

locations/journal_quests.qsrc

@@ -445,7 +445,7 @@ if $ARGS[0] = 'start':
 				'Success. Katja doesn''t wear panties to school anymore.'
 			end
 			if npc_sex['A14'] >= 1:
-				if strapon = 0:
+				if mc_inventory['strapon'] = 0:
 					'I should buy a strap-on so that I can use it on Katja.'
 				elseif katjaQW['slut'] < 40:
 					if katjaQW['strapon_vag'] + katjaQW['strapon_ass'] + katjaQW['strapon_bj'] > 0:
@@ -540,7 +540,7 @@ if yearstart > 1 and university['enrolled_in_semester'] > university['semester_p
 		!!	'Success. Katja doesn''t wear panties to school anymore.'
 		!!end
 		if npc_sex['A14'] >= 1:
-			if strapon = 0:
+			if mc_inventory['strapon'] = 0:
 				'I should buy a strap-on so that I can use it on Katja.'
 			elseif katjaQW['slut'] < 40:
 				if katjaQW['strapon_vag'] + katjaQW['strapon_ass'] + katjaQW['strapon_bj'] > 0:

locations/katjaEvDin.qsrc

@@ -500,7 +500,7 @@ if $ARGS[0] = 'sex':
 	end
 
 	!!This is for a scene of using a dildo on Katja. Such a scene is not yet written.
-	!!if (katjaQW['slut'] >= 30) and katjaQW['horny'] >= 30 and dildo > 0:
+	!!if (katjaQW['slut'] >= 30) and katjaQW['horny'] >= 30 and mc_inventory['dildo_small'] > 0:
 	!!	act 'Grab a dildo': gt 'KatjaEvDin', 'dildo'
 	!!end
 

locations/kompMFC.qsrc

@@ -1,6 +1,6 @@
 # kompMFC
 
-if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1 or superdildo = 1 or maddildo = 1:
+if mc_inventory['vibe'] = 1 or mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_normal'] = 1 or mc_inventory['dildo_big'] = 1 or mc_inventory['dildo_large'] = 1 or mc_inventory['dildo_huge'] = 1 or mc_inventory['dildo_enormous'] = 1 or mc_inventory['dildo_gigantic'] = 1:
 	cls
 	gs 'stat'
 	'One of the visitors asks: "Do you have a vibrator or dildo? I want you to put up a little show and fuck yourself with it..."'
@@ -55,7 +55,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 			act 'Do it anyway':
 				cls
 				gs 'stat'
-				if vibrator = 1:
+				if mc_inventory['vibe'] = 1:
 					act 'Use your vibrator':
 						cls
 						mfcclients = 0
@@ -98,7 +98,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						act'Continue':gt 'komp','waitclients'
 					end
 				end
-				if dildo = 1:
+				if mc_inventory['dildo_small'] = 1:
 					act 'Use your small dildo':
 						cls
 						mfcclients = 0
@@ -140,7 +140,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						act'Continue':gt 'komp','waitclients'
 					end
 				end
-				if middildo = 1:
+				if mc_inventory['dildo_normal'] = 1:
 					if pcs_ass >= 15:
 						act 'Use your medium dildo':
 							cls
@@ -184,7 +184,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						end
 					end
 				end
-				if largedildo = 1:
+				if mc_inventory['dildo_big'] = 1:
 					if pcs_ass >= 20:
 						act 'Use your large dildo':
 							cls
@@ -229,7 +229,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						end
 					end
 				end
-				if bigdildo = 1:
+				if mc_inventory['dildo_large'] = 1:
 					if pcs_ass >= 25:
 						act 'Use your very large dildo':
 							cls
@@ -274,7 +274,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						end
 					end
 				end
-				if extradildo = 1:
+				if mc_inventory['dildo_huge'] = 1:
 					if pcs_ass >= 30:
 						act 'Use your 30cm dildo':
 							cls
@@ -319,7 +319,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						end
 					end
 				end
-				if superdildo = 1:
+				if mc_inventory['dildo_enormous'] = 1:
 					if pcs_ass >= 35:
 						act 'Use your humongous 35cm dildo':
 							cls
@@ -364,7 +364,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						end
 					end
 				end
-				if maddildo = 1:
+				if mc_inventory['dildo_gigantic'] = 1:
 					if pcs_ass >= 35:
 						act 'Use your enormous 40cm dildo':
 							cls
@@ -431,7 +431,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 			end	
 		end
 	elseif pcs_vag > 0:
-		if vibrator = 1:
+		if mc_inventory['vibe'] = 1:
 			act 'Use your vibrator':
 				cls
 				mfcclients = 0
@@ -472,7 +472,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if dildo = 1:
+		if mc_inventory['dildo_small'] = 1:
 			act 'Use your small dildo':
 				cls
 				mfcclients = 0
@@ -513,7 +513,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if middildo = 1:
+		if mc_inventory['dildo_normal'] = 1:
 			act 'Use your medium dildo':
 				cls
 				mfcclients = 0
@@ -555,7 +555,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				act'Further':gt 'komp','waitclients'
 			end
 		end
-		if largedildo = 1:
+		if mc_inventory['dildo_big'] = 1:
 			act 'Use your large dildo':
 				cls
 				mfcclients = 0
@@ -607,7 +607,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if bigdildo = 1:
+		if mc_inventory['dildo_large'] = 1:
 			act 'Use your very large dildo':
 				cls
 				mfcclients = 0
@@ -660,7 +660,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if extradildo = 1:
+		if mc_inventory['dildo_huge'] = 1:
 			if pcs_vag >= 25:
 				act 'Use your 30cm dildo':
 					cls
@@ -715,7 +715,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				end
 			end
 		end
-		if superdildo = 1:
+		if mc_inventory['dildo_enormous'] = 1:
 			if pcs_vag >= 25:
 				act 'Use your humongous 35cm dildo':
 					cls
@@ -771,7 +771,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				end
 			end
 		end
-		if maddildo = 1:
+		if mc_inventory['dildo_gigantic'] = 1:
 			if pcs_vag >= 30:
 				act 'Use your enormous 40cm dildo':
 					cls

locations/kompMFCanal.qsrc

@@ -3,11 +3,11 @@
 *clr & cla
 gs 'stat'
 'One of the visitors asks: "Do you have a vibrator or dildo? I want to see your ass stuffed..."'
-if vibrator = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or (largedildo = 1 and pcs_ass >= 15) or (bigdildo = 1 and pcs_ass >= 20) or (extradildo = 1 and pcs_ass >= 25) or (superdildo = 1 and pcs_ass >= 30) or (maddildo = 1 and pcs_ass >= 35):
+if mc_inventory['vibe'] = 1 or mc_inventory['dildo_small'] = 1 or (middildo = 1 and pcs_ass >= 10) or (largedildo = 1 and pcs_ass >= 15) or (bigdildo = 1 and pcs_ass >= 20) or (extradildo = 1 and pcs_ass >= 25) or (superdildo = 1 and pcs_ass >= 30) or (maddildo = 1 and pcs_ass >= 35):
 	act 'Play with a toy':
 		*clr & cla
 		gs 'stat'
-		if vibrator = 1:
+		if mc_inventory['vibe'] = 1:
 			act 'Use your vibrator':
 				*clr & cla
 				mfcclients = 0
@@ -50,7 +50,7 @@ if vibrator = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or (largedildo
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if dildo = 1:
+		if mc_inventory['dildo_small'] = 1:
 			act 'Use your small dildo':
 				*clr & cla
 				mfcclients = 0
@@ -92,7 +92,7 @@ if vibrator = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or (largedildo
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if middildo = 1 and pcs_ass >= 10:
+		if mc_inventory['dildo_normal'] = 1 and pcs_ass >= 10:
 			act 'Use your medium dildo':
 				*clr & cla
 				mfcclients = 0
@@ -134,7 +134,7 @@ if vibrator = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or (largedildo
 				act'Further':gt 'komp','waitclients'
 			end
 		end
-		if largedildo = 1 and pcs_ass >= 15:
+		if mc_inventory['dildo_big'] = 1 and pcs_ass >= 15:
 			act 'Use your large dildo':
 				*clr & cla
 				mfcclients = 0
@@ -177,7 +177,7 @@ if vibrator = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or (largedildo
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if bigdildo = 1 and pcs_ass >= 20:
+		if mc_inventory['dildo_large'] = 1 and pcs_ass >= 20:
 			act 'Use your very large dildo':
 				*clr & cla
 				mfcclients = 0
@@ -220,7 +220,7 @@ if vibrator = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or (largedildo
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if extradildo = 1 and pcs_ass >= 25:
+		if mc_inventory['dildo_huge'] = 1 and pcs_ass >= 25:
 			act 'Use your 30cm dildo':
 				*clr & cla
 				mfcclients = 0
@@ -263,7 +263,7 @@ if vibrator = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or (largedildo
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if superdildo = 1 and pcs_ass >= 30:
+		if mc_inventory['dildo_enormous'] = 1 and pcs_ass >= 30:
 			act 'Use your humongous 35cm dildo':
 				*clr & cla
 				mfcclients = 0
@@ -306,7 +306,7 @@ if vibrator = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or (largedildo
 				act'Continue':gt 'komp','waitclients'
 			end
 		end
-		if maddildo = 1 and pcs_ass >= 35:
+		if mc_inventory['dildo_gigantic'] = 1 and pcs_ass >= 35:
 			act 'Use your enormous 40cm dildo':
 				*clr & cla
 				mfcclients = 0

locations/kompMFCoral.qsrc

@@ -3,11 +3,11 @@
 cls
 gs 'stat'
 'One of the visitors asks, "Do you have a dildo or something? I''d love to see your throat skills..."'
-if dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1 or superdildo = 1 or maddildo = 1:
+if mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_normal'] = 1 or mc_inventory['dildo_big'] = 1 or mc_inventory['dildo_large'] = 1 or mc_inventory['dildo_huge'] = 1 or mc_inventory['dildo_enormous'] = 1 or mc_inventory['dildo_gigantic'] = 1:
 		act 'Suck':
 		cls
 		gs 'stat'
-		if dildo = 1:
+		if mc_inventory['dildo_small'] = 1:
 			act 'Use your small dildo':
 				cls
 				mfcclients = 0
@@ -40,7 +40,7 @@ if dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1
 				act'Continue':gt'komp','waitclients'
 			end
 		end
-		if middildo = 1:
+		if mc_inventory['dildo_normal'] = 1:
 			act 'Use your medium dildo':
 				cls
 				if pcs_throat < 15:
@@ -103,7 +103,7 @@ if dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1
 				act'Continue':gt'komp','waitclients'
 			end
 		end
-		if largedildo = 1 or bigdildo = 1 or extradildo = 1:
+		if mc_inventory['dildo_big'] = 1 or mc_inventory['dildo_large'] = 1 or mc_inventory['dildo_huge'] = 1:
 			act 'Use a bigger dildo':
 				cls
 				if pcs_throat < 25:
@@ -166,7 +166,7 @@ if dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1
 				act'Continue':gt'komp','waitclients'
 			end
 		end
-		if superdildo = 1 or maddildo = 1:
+		if mc_inventory['dildo_enormous'] = 1 or mc_inventory['dildo_gigantic'] = 1:
 			act 'Use the biggest dildo you have':
 			cls
 				if pcs_throat < 35:

locations/korr.qsrc

@@ -86,7 +86,7 @@ else
 	'A modern hall with stylish furniture, including a wall-mounted <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
 end
 
-if umbrella > 0:'Your umbrella hangs on a hook.'
+if mc_inventory['umbrella'] > 0:'Your umbrella hangs on a hook.'
 
 if krolik = 1:'Your rabbit <a href="exec:gt ''krol'', ''start''"><<$namekrol>></a> sits in it''s cage on the floor.'
 if ParrotQW['Owned1'] = 1:'Your parrot <a href="exec:gt ''popu'', ''start''"><<$ParrotQW[''Name1'']>></a> sits in it''s cage.'

locations/korr2x.qsrc

@@ -31,7 +31,7 @@ end
 '<center><b><font color = maroon>Corridor</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pushkin/apartment/korr2x.jpg"></center>'
 
-if umbrella > 0:'Your umbrella is on a hook.'
+if mc_inventory['umbrella'] > 0:'Your umbrella is on a hook.'
 if krolik = 1:'Your rabbit <a href="exec:gt ''krol'', ''start''"><<$namekrol>></a> sits in it''s cage on the floor.'
 if ParrotQW['Owned1'] = 1:'Your parrot <a href="exec:gt ''popu'', ''start''"><<$ParrotQW[''Name1'']>></a> sits in it''s cage.'
 if parkday ! daystart and parkblackmail = 1:

locations/kuhr.qsrc

@@ -105,7 +105,7 @@ if musor > 3:
 	end
 end
 
-if dildo > 0 and pcs_horny >= 50:
+if mc_inventory['dildo_small'] > 0 and pcs_horny >= 50:
 	act 'Masturbate with dildo':
 		*clr & cla
 		if pcs_inhib < 30:inhib_exp += rand(1,3)

locations/kuhr2x.qsrc

@@ -97,7 +97,7 @@ dynamic $fatdel
 dynamic $lekarstvo
 dynamic $vitamin
 
-if dildo > 0 and pcs_horny >= 50:
+if mc_inventory['dildo_small'] > 0 and pcs_horny >= 50:
 	act 'Masturbate':
 		cla
 		*clr

locations/lezbsex.qsrc

@@ -41,14 +41,14 @@ if $ARGS[0] = 'var':
 
 	if picrand ! 12 and picrand ! 13 and picrand ! 14 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Get a rimjob':gt 'lezbsex', 'anuli'
 	if picrand ! 12 and picrand ! 13 and picrand ! 14 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Give her a rimjob':gt 'lezbsex', 'uanuli'
-	if strapon = 1 and picrand ! 11 and picrand ! 12 and picrand ! 13 and picrand ! 14 and picrand ! 15 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 19 and picrand ! 20 and picrand ! 21 and picrand ! 22:
+	if mc_inventory['strapon'] = 1 and picrand ! 11 and picrand ! 12 and picrand ! 13 and picrand ! 14 and picrand ! 15 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 19 and picrand ! 20 and picrand ! 21 and picrand ! 22:
 		act 'Strapon-fuck her':gt 'lezbsex', 'svag'
 		act 'Strapon-fuck her in the ass':gt 'lezbsex', 'sanal'
 		act 'Get strapon-fucked':gt 'lezbsex', 'usvag'
 		act 'Get strapon-fucked in the ass':gt 'lezbsex', 'usanal'
 	end
 
-	if dildo = 1 and picrand ! 12 and picrand ! 19 and picrand ! 20 and picrand ! 22:
+	if mc_inventory['dildo_small'] = 1 and picrand ! 12 and picrand ! 19 and picrand ! 20 and picrand ! 22:
 		act 'Play with the dildo':gt 'lezbsex', 'dvag'
 
 		if picrand ! 11 and picrand ! 15 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Anal play with the dildo':gt 'lezbsex', 'danal'

locations/mey_home.qsrc

@@ -254,7 +254,7 @@ if $ARGS[0] = 'guest_bedroom':
 	gs 'exercise', 'start'
 	gs 'music_actions', 'music_icon'
 	if pcs_horny >= 50:	act 'Masturbate':gt 'selfplay', 'start'
-	if pornMagazine > 0:
+	if mc_inventory['mag_porn'] > 0:
 		'You hide your porn magazines under the mattress of your bed.'
 		gs 'events', 'read_porn'
 	end

locations/mirror.qsrc

@@ -290,7 +290,7 @@ if $ARGS[0] = 'start':
 	end
 
 	*nl
-	if umbrella = 0: 'WARNING: Makeup will run in the rain unless you buy an umbrella.'
+	if mc_inventory['umbrella'] = 0: 'WARNING: Makeup will run in the rain unless you buy an umbrella.'
 
 	act 'Move away from the mirror':gt 'mirror','fin'
 

locations/mother.qsrc

@@ -1968,23 +1968,23 @@ if $ARGS[0] = 'dildo_find':
 				'"I think I''m old enough..." you argue back.'
 				'<<$npc_nickname[''A29'']>> starts laughing, "If you say so honey."'
 				!if Sveta has several dildos
-				if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 1:
+				if 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'] > 1:
 					'"You''ve already built up a collection of them..." <<$npc_nickname[''A29'']>> looks at you awaiting an answer.'
 					'"You never know which one you might need..." you try to explain..."'
 					'"Oh honey, you need to find the correct one and then use that one, not having lots of them laying around. What if we have guests over and the stumble across one? I would be so ashamed..." <<$npc_nickname[''A29'']>> starts whining.'
 					'"Don''t let them enter my room then... This is getting too awkward I don''t want to talk about it anymore." you reply.'
 					'"Fine, fine... I still don''t understand why you need so many of them..." <<$npc_nickname[''A29'']>> comments as she leaves the room.'
-				elseif dildo = 1 or middildo = 1:
+				elseif mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_normal'] = 1:
 					'"I''ll give you this at least, you picked a perfect starting dildo. The size should fit someone unexperienced..." <<$npc_nickname[''A29'']>> starts talking about it.'
 					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
-				elseif largedildo = 1 or bigdildo = 1:
+				elseif mc_inventory['dildo_big'] = 1 or mc_inventory['dildo_large'] = 1:
 					'"Isn''t this a bit too big for you? It''s... a bit bigger than I expected to find if I were ever to find something like this..." <<$npc_nickname[''A29'']>> starts talking about it.'
 					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
-				elseif extradildo = 1 or superdildo = 1:
+				elseif mc_inventory['dildo_huge'] = 1 or mc_inventory['dildo_enormous'] = 1:
 					'<<$npc_nickname[''A29'']>> starts laughing, "Well, you didn''t buy a correct one. There is now way this will fit in any hole..."'
 					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
@@ -1995,7 +1995,7 @@ if $ARGS[0] = 'dildo_find':
 					'"Okay, okay. Just so you know I''m not too fond of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on.'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 				end
-				act 'Put away the dildo'+iif(dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 1, 's',''): gt 'bedrPar'
+				act 'Put away the dildo'+iif(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'] > 1, 's',''): gt 'bedrPar'
 			end
 		end
 	end
@@ -2010,23 +2010,23 @@ if $ARGS[0] = 'dildo_find':
 		'"N-No," you stutter, "It was a gift from a friend, she misclicked when ordering and bought two so she gave the extra one to me..."'
 		'"A gift, huh?" your <<$npc_nickname[''A29'']>> is hesitant to believe you and just as you''re about to tell her to leave your room, she...'
 		!if Sveta has several dildos
-		if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 1:
+		if 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'] > 1:
 			'"Your friend must be quite rich if she gave all these away..." <<$npc_nickname[''A29'']>> looks at you awaiting an answer.'
 			'"They have quite lot of money..." you try to explain..."'
 			'"Oh honey, you need to find the correct one and then use that one, not having lots of them laying around. What if we have guests over and the stumble across one? I would be so ashamed..." <<$npc_nickname[''A29'']>> starts whining.'
 			'"Don''t let them enter my room then... This is getting too awkward I don''t want to talk about it anymore." you reply.'
 			'"Fine, fine... I still don''t understand why you need so many of them..." <<$npc_nickname[''A29'']>> comments as she leaves the room.'
-		elseif dildo = 1 or middildo = 1:
+		elseif mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_normal'] = 1:
 			'"I''ll give your friend this at least, she picked the perfect starting dildo. The size should fit someone unexperienced..." <<$npc_nickname[''A29'']>> starts talking about it.'
 			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
-		elseif largedildo = 1 or bigdildo = 1:
+		elseif mc_inventory['dildo_big'] = 1 or mc_inventory['dildo_large'] = 1:
 			'"Isn''t this a bit too big for you and your friend? It''s... a bit bigger than I expected to find if I were ever to find something like this..." <<$npc_nickname[''A29'']>> starts talking about it.'
 			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
-		elseif extradildo = 1 or superdildo = 1:
+		elseif mc_inventory['dildo_huge'] = 1 or mc_inventory['dildo_enormous'] = 1:
 			'<<$npc_nickname[''A29'']>> starts laughing, "Well, I understand why your friend gave it away, she didn''t buy a correct one. There is now way this will fit in any hole..."'
 			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
@@ -2037,7 +2037,7 @@ if $ARGS[0] = 'dildo_find':
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 		end
-		act 'Put away the dildo'+iif(dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 1, 's',''): gt 'bedrPar'
+		act 'Put away the dildo'+iif(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'] > 1, 's',''): gt 'bedrPar'
 	end
 end
 

locations/mother_sextalk.qsrc

@@ -163,7 +163,7 @@ if $ARGS[0] = 'bathroom_dildo_shriek3':
 	vanrPar_bathtub_dildo = 0
 	vanrPar_bath_shower_dildo = 0
 	vanrPar_suction_dildo = 0
-	suction_dildo += motherQW['bathroom_dildos']
+	mc_inventory['dildo_suction'] += motherQW['bathroom_dildos']
 	motherQW['dildo_caught'] += 1
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
@@ -178,7 +178,7 @@ if $ARGS[0] = 'bathroom_dildo_shriek4':
 	vanrPar_bathtub_dildo = 0
 	vanrPar_bath_shower_dildo = 0
 	vanrPar_suction_dildo = 0
-	suction_dildo += motherQW['bathroom_dildos']
+	mc_inventory['dildo_suction'] += motherQW['bathroom_dildos']
 	motherQW['dildo_caught'] += 1
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
@@ -342,7 +342,7 @@ if $ARGS[0] = 'bathroom_dildos3':
 	vanrPar_bath_shower_dildo = 0
 	vanrPar_suction_dildo = 0
 	motherQW['dildo_caught'] += 1
-	suction_dildo += motherQW['bathroom_dildos']
+	mc_inventory['dildo_suction'] += motherQW['bathroom_dildos']
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
 	'As you step into the hall of your family home, you see your mother is there waiting for you. She looks more exasperated than angry.'
@@ -547,7 +547,7 @@ if $ARGS[0] = 'dildo_wakeup3':
 	vanrPar_bath_shower_dildo = 0
 	vanrPar_suction_dildo = 0
 	motherQW['dildo_caught'] += 1
-	suction_dildo += motherQW['bathroom_dildos']
+	mc_inventory['dildo_suction'] += motherQW['bathroom_dildos']
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	if motherQW['bathroom_dildos'] = 1:

locations/nichBedroomServant.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 
 	if pcs_horny >= 50: act 'Masturbate': gt'selfplay', 'start'
 
-	if pornMagazine > 0:
+	if mc_inventory['mag_porn'] > 0:
 		'You hide a porn magazine under your mattress.'
 		gs 'events', 'read_porn'
 	end

locations/nichTanya.qsrc

@@ -1609,7 +1609,7 @@ if $ARGS[0] = 'sex_matrix':
 				gt 'nichTanya','psovaginal'
 			end
 		end
-		if strapon > 0:
+		if mc_inventory['strapon'] > 0:
 			act 'Fuck her (strapon)':
 				gt 'nichTanya','asovaginal'
 			end

locations/outdoors.qsrc

@@ -265,7 +265,7 @@ if $ARGS[0] = 'main':
 	gs 'themes', 'outdoors'
 
 	if $location_type = 'public_outdoors' or $location_type = 'secluded' or $location_type = 'event_outdoors':
-		if sunWeather = 0 and umbrella = 0:
+		if sunWeather = 0 and mc_inventory['umbrella'] = 0:
 			*NL 'It is raining and you do not have an umbrella.'
 			if pcs_makeup > 1 and cosmetic_tattoo = 0:
 				pcs_makeup = 0

locations/pav_aptcourtev.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'bench':
 	'You take a seat on one of the benches in the courtyard and relax.'
 	act 'Get up': gt 'pav_complex', 'start'
 	act 'Wait thirty minutes': gt 'pav_aptcourtev', 'wait'
-	if cookmag = 1 or fashmag = 1 or compmag = 1 or biomag = 1 or knitmag = 1 or fitmag = 1: act 'Read a magazine': gt 'pav_aptcourtev', 'read'
+	if mc_inventory['mag_cooking'] = 1 or mc_inventory['mag_fashion'] = 1 or mc_inventory['mag_computer'] = 1 or mc_inventory['mag_biography'] = 1 or mc_inventory['mag_knitting'] = 1 or mc_inventory['mag_fitness'] = 1: act 'Read a magazine': gt 'pav_aptcourtev', 'read'
 	act 'Play on your phone': gt 'pav_aptcourtev', 'phone'
 	if mc_inventory['cigarettes'] > 0: act 'Smoke': gt 'pav_aptcourtev', 'smoke'
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gt 'pav_aptcourtev', 'smoke_joint'

locations/pav_disco_coolkids.qsrc

@@ -873,7 +873,7 @@ if $ARGS[0] = 'igor_dance':
 			'"Mistress, I love you so much. Come with me." he whispers in your ear.'
 
 			act 'Go with Igor':
-				if strapon >= 1:
+				if mc_inventory['strapon'] >= 1:
 					gt 'igorev', 'strap on'
 				else
 					gt 'igorev', 'din_sex'

locations/pav_disco_gopniks.qsrc

@@ -1541,7 +1541,7 @@ if $ARGS[0] = 'anushka_dance':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
 						'As the two of you grind against each other, you grab her hips with your hands and disentangle your legs. With your legs now free of each other, you give her body a twist with your hands, keeping your hands on her hips until she''s facing away from you. She leans back to dance against you, with her back rubbing against your breasts. You slide your hands around towards the front of her hips as you take a step back before pulling her hips towards you.'
 						'She bends forward slightly as you start bouncing your hips against her ass. She loudly giggles at your antics and bucks her ass against you. This gets a lot of hoots and hollers from the boys watching, and by her movements you can tell she''s getting turned on. Maybe she would be up for bit of the real thing?'
-						if strapon = 1:
+						if mc_inventory['strapon'] = 1:
 							'You have your strapon in your purse. Maybe she would be up for getting one of her holes pounded?'
 						end
 						gs 'arousal', 'foreplay', 5, 'exhibitionism'
@@ -1571,7 +1571,7 @@ if $ARGS[0] = 'anushka_dance':
 								act 'Take her home': gt 'anushkaev1','bedroom_lesbian'
 							end
 						end
-						if strapon = 1 and stat['think_virgin'] = 0 and PCLoSkirt > 0:
+						if mc_inventory['strapon'] = 1 and stat['think_virgin'] = 0 and PCLoSkirt > 0:
 							act 'You want her to fuck you':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
@@ -1593,7 +1593,7 @@ if $ARGS[0] = 'anushka_dance':
 								end
 							end
 						end
-						if strapon = 1 and PCLoSkirt > 0:
+						if mc_inventory['strapon'] = 1 and PCLoSkirt > 0:
 							act 'You want to butt fuck her':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'

locations/pav_shared_apt.qsrc

@@ -842,7 +842,7 @@ if $ARGS[0] = 'sofabed':
 		act 'Watch some TV':gt 'TV', 'start'
 	end
 
-	if pornMagazine > 0:
+	if mc_inventory['mag_porn'] > 0:
 		'<br>There is a porn magazine under the sofa cushions'
 		gs 'events', 'read_porn'
 	end

locations/pav_train_market.qsrc

@@ -550,11 +550,11 @@ if ARGS[0] = 4:
 				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		end
-		if money >= 1000 and suction_dildo = 0:
+		if money >= 1000 and mc_inventory['dildo_suction'] = 0:
 			act 'Buy a 15cm suction dildo (1000 <b>₽</b>)':
 				cla
 				minut += 5
-				suction_dildo += 1
+				mc_inventory['dildo_suction'] += 1
 				money -= 1000
 				pcs_horny += 10
 				TimesBuyPorno += 1
@@ -567,11 +567,11 @@ if ARGS[0] = 4:
 				act 'Leave':gt 'pav_train_market', 'start'
 				act 'Buy something else':gt 'pav_train_market', 4
 			end
-		elseif money >= 1000 and suction_dildo > 0:
+		elseif money >= 1000 and mc_inventory['dildo_suction'] > 0:
 			act 'Buy another 15cm suction dildo (1000<b>₽</b>)':
 				cla
 				minut += 5
-				suction_dildo += 1
+				mc_inventory['dildo_suction'] += 1
 				money -= 1000
 				pcs_horny += 10
 				TimesBuyPorno += 1
@@ -585,11 +585,11 @@ if ARGS[0] = 4:
 				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		end
-		if money >= 700 and vibrator = 0:
+		if money >= 700 and mc_inventory['vibe'] = 0:
 			act 'Buy vibrator (700<b>₽</b>)':
 				cla
 				minut += 5
-				vibrator = 1
+				mc_inventory['vibe'] = 1
 				money -= 700
 				pcs_horny += 10
 				TimesBuyPorno += 1
@@ -602,12 +602,12 @@ if ARGS[0] = 4:
 				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		end
-		if money >= 700 and analplug = 0:
+		if money >= 700 and mc_inventory['buttplug'] = 0:
 			act 'Buy butt plug (700<b>₽</b>)':
 				cla
 				minut += 5
 				money -= 700
-				analplug = 1
+				mc_inventory['buttplug'] = 1
 !!this needs to be changed from analplug bought to smallbp for the smallone
 				pcs_horny += 10
 				TimesBuyPorno += 1
@@ -622,11 +622,11 @@ if ARGS[0] = 4:
 			end
 		end
 		if middildo > 0:
-			if money >= 500 and strapon = 0:
+			if money >= 500 and mc_inventory['strapon'] = 0:
 				act 'Buy strap-on harness (500<b>₽</b>)':
 					cla
 					minut += 5
-					strapon = 1
+					mc_inventory['strapon'] = 1
 					strapnumber = 2
 					money -= 500
 					pcs_horny += 10
@@ -642,11 +642,11 @@ if ARGS[0] = 4:
 				end
 			end
 		else
-			if money >= 1200 and strapon = 0 and middildo = 0:
+			if money >= 1200 and mc_inventory['strapon'] = 0 and middildo = 0:
 				act 'Buy strap-on harness with a 15cm dildo (1200<b>₽</b>)':
 					cla
 					minut += 5
-					strapon = 1
+					mc_inventory['strapon'] = 1
 					middildo = 1
 					strapnumber = 2
 					money -= 1200

locations/saveupdater.qsrc

@@ -2021,30 +2021,30 @@ if temp_current_save_version < 00090003:
 	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 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' 
-!	if biomag > 0:			 mc_inventory['mag_biography']	= biomag		  &killvar'biomag' 
-!	if cookmag > 0:			 mc_inventory['mag_cooking']	= cookmag		  &killvar'cookmag' 
-!	if knitmag > 0:			 mc_inventory['mag_knitting']	= knitmag		  &killvar'knitmag' 
-!	if fitmag > 0:			 mc_inventory['mag_fitness']	= fitmag		  &killvar'fitmag' 
-!	if umbrella > 0:		 mc_inventory['umbrella']		= umbrella		  &killvar'umbrella'
-!	if pornMagazine > 0:	 mc_inventory['mag_porn']		= pornMagazine	  &killvar'pornMagazine'
-!	if vibrator > 0:		 mc_inventory['vibe']			= vibrator		  &killvar'vibrator'
-!	if analplug > 0:		 mc_inventory['buttplug']		= analplug		  &killvar'analplug'
-!	if suction_dildo > 0:	 mc_inventory['dildo_suction']	= suction_dildo	  &killvar'suction_dildo'
-!	if strapon > 0:			 mc_inventory['harness']		= strapon		  &killvar'strapon'
-!	if dildo > 0:			 mc_inventory['dildo_small']	= dildo			  &killvar'dildo'
-!	if middildo > 0:		 mc_inventory['dildo_normal']	= middildo		  &killvar'middildo'
-!	if largedildo > 0:		 mc_inventory['dildo_big']		= largedildo	  &killvar'largedildo'
-!	if bigdildo > 0:		 mc_inventory['dildo_large']	= bigdildo		  &killvar'bigdildo'
-!	if extradildo > 0:		 mc_inventory['dildo_huge']		= extradildo	  &killvar'extradildo'
-!	if superdildo > 0:		 mc_inventory['dildo_enormous']	= superdildo	  &killvar'superdildo'
-!	if maddildo > 0:		 mc_inventory['dildo_gigantic']	= maddildo		  &killvar'maddildo'
+	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' 
+	if biomag > 0:			 mc_inventory['mag_biography']	= biomag		  &killvar'biomag' 
+	if cookmag > 0:			 mc_inventory['mag_cooking']	= cookmag		  &killvar'cookmag' 
+	if knitmag > 0:			 mc_inventory['mag_knitting']	= knitmag		  &killvar'knitmag' 
+	if fitmag > 0:			 mc_inventory['mag_fitness']	= fitmag		  &killvar'fitmag' 
+	if umbrella > 0:		 mc_inventory['umbrella']		= umbrella		  &killvar'umbrella'
+	if pornMagazine > 0:	 mc_inventory['mag_porn']		= pornMagazine	  &killvar'pornMagazine'
+	if vibrator > 0:		 mc_inventory['vibe']			= vibrator		  &killvar'vibrator'
+	if analplug > 0:		 mc_inventory['buttplug']		= analplug		  &killvar'analplug'
+	if suction_dildo > 0:	 mc_inventory['dildo_suction']	= suction_dildo	  &killvar'suction_dildo'
+	if strapon > 0:			 mc_inventory['strapon']		= strapon		  &killvar'strapon'
+	if dildo > 0:			 mc_inventory['dildo_small']	= dildo			  &killvar'dildo'
+	if middildo > 0:		 mc_inventory['dildo_normal']	= middildo		  &killvar'middildo'
+	if largedildo > 0:		 mc_inventory['dildo_big']		= largedildo	  &killvar'largedildo'
+	if bigdildo > 0:		 mc_inventory['dildo_large']	= bigdildo		  &killvar'bigdildo'
+	if extradildo > 0:		 mc_inventory['dildo_huge']		= extradildo	  &killvar'extradildo'
+	if superdildo > 0:		 mc_inventory['dildo_enormous']	= superdildo	  &killvar'superdildo'
+	if maddildo > 0:		 mc_inventory['dildo_gigantic']	= maddildo		  &killvar'maddildo'
 end
 	
 
-
+! 
 
 
 killvar 'temp_current_save_version'

locations/selfplay.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 	gs 'selfplay', 'sis_prov'
 
 	! This keeps resetting your dildo choices and makes it impossible to masturbate with them. Sicaa
-	!if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo ! 0:
+	!if 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:
 	!	dildonumber = 0
 	!end
 	if dildonumber > 0: gs 'boyStat', 'D<<dildonumber>>' & dildohand = (dildonumber + 1) * 5
@@ -80,7 +80,7 @@ if $ARGS[0] = 'start':
 	if pcs_horny > 0 and agape < 3: gs 'selfplay', 'anal_fingering'
 
 	if pcs_horny > 10:
-		if dildo >= 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1 or superdildo = 1 or maddildo = 1:
+		if mc_inventory['dildo_small'] >= 1 or mc_inventory['dildo_normal'] = 1 or mc_inventory['dildo_big'] = 1 or mc_inventory['dildo_large'] = 1 or mc_inventory['dildo_huge'] = 1 or mc_inventory['dildo_enormous'] = 1 or mc_inventory['dildo_gigantic'] = 1:
 
 			if dildonumber > 0:
 				gs 'boyStat', 'D<<dildonumber>>'
@@ -174,7 +174,7 @@ if $ARGS[0] = 'dildo_options':
 
 	*pl
 
-	if dildo = 1:
+	if mc_inventory['dildo_small'] = 1:
 		if dildonumber = 1:
 			*pl '<a href="exec:dildonumber = 0 & gt ''selfplay'', ''start''">Stop</a> using the 10cm long dildo.'
 		else
@@ -182,7 +182,7 @@ if $ARGS[0] = 'dildo_options':
 		end
 	end
 
-	if middildo = 1:
+	if mc_inventory['dildo_normal'] = 1:
 		if dildonumber = 2:
 			*pl '<a href="exec:dildonumber = 0 & gt ''selfplay'', ''start''">Stop</a> using the 15cm long dildo.'
 		else
@@ -190,7 +190,7 @@ if $ARGS[0] = 'dildo_options':
 		end
 	end
 
-	if largedildo = 1:
+	if mc_inventory['dildo_big'] = 1:
 		if dildonumber = 3:
 			*pl '<a href="exec:dildonumber = 0 & gt ''selfplay'', ''start''">Stop</a> using the 20cm long dildo.'
 		else
@@ -198,7 +198,7 @@ if $ARGS[0] = 'dildo_options':
 		end
 	end
 
-	if bigdildo = 1:
+	if mc_inventory['dildo_large'] = 1:
 		if dildonumber = 4:
 			*pl '<a href="exec:dildonumber = 0 & gt ''selfplay'', ''start''">Stop</a> using the 25cm long dildo.'
 		else
@@ -206,7 +206,7 @@ if $ARGS[0] = 'dildo_options':
 		end
 	end
 
-	if extradildo = 1:
+	if mc_inventory['dildo_huge'] = 1:
 		if dildonumber = 5:
 			*pl '<a href="exec:dildonumber = 0 & gt ''selfplay'', ''start''">Stop</a> using the 30cm long dildo.'
 		else
@@ -214,7 +214,7 @@ if $ARGS[0] = 'dildo_options':
 		end
 	end
 
-	if superdildo = 1:
+	if mc_inventory['dildo_enormous'] = 1:
 		if dildonumber = 6:
 			*pl '<a href="exec:dildonumber = 0 & gt ''selfplay'', ''start''">Stop</a> using the 35cm long dildo.'
 		else
@@ -222,7 +222,7 @@ if $ARGS[0] = 'dildo_options':
 		end
 	end
 
-	if maddildo = 1:
+	if mc_inventory['dildo_gigantic'] = 1:
 		if dildonumber = 7:
 			*pl '<a href="exec:dildonumber = 0 & gt ''selfplay'', ''start''">Stop</a> using the 40cm long dildo.'
 		else
@@ -237,14 +237,14 @@ end
 !! glass_shower_dildo - dildo applied to glass wall of a shower with no tub
 
 if $ARGS[0] = 'suction_dildo':
-	if dyneval('result = <<$loc>>_bathtub_dildo') ! 1 and suction_dildo > 0:
+	if dyneval('result = <<$loc>>_bathtub_dildo') ! 1 and mc_inventory['dildo_suction'] > 0:
 		*nl
 		'You can stick your suction dildo to the <a href="exec:gs ''selfplay'',''bathtub_suction_dildo_apply'' & gt $loc, $loc_arg">bath tub</a> to play with.'
 	elseif dyneval('result = <<$loc>>_bathtub_dildo') = 1:
 		'Your <a href="exec:gs ''selfplay'',''bath_suction_dildo''">suction dildo</a> is stuck to the bath tub.'
 	end
 	*nl
-	if suction_dildo > 0 and dyneval('result = <<$loc>>_bath_shower_dildo') ! 1 and dyneval('result = <<$loc>>_glass_shower_dildo') ! 1:
+	if mc_inventory['dildo_suction'] > 0 and dyneval('result = <<$loc>>_bath_shower_dildo') ! 1 and dyneval('result = <<$loc>>_glass_shower_dildo') ! 1:
 		*nl
 		'You can also stick a suction dildo inside <a href="exec:gs ''selfplay'',''shower_suction_dildo_apply'' & gt $loc, $loc_arg">the shower</a>.'
 	elseif dyneval('result = <<$loc>>_bath_shower_dildo') = 1 or dyneval('result = <<$loc>>_glass_shower_dildo') = 1:
@@ -255,7 +255,7 @@ end
 if $ARGS[0] = 'bathtub_suction_dildo_apply':
 	dynamic('<<$loc>>_bathtub_dildo = 1')
 	dynamic('<<$loc>>_suction_dildo += 1')
-	suction_dildo -= 1
+	mc_inventory['dildo_suction'] -= 1
 	
 
 end
@@ -263,7 +263,7 @@ end
 if $ARGS[0] = 'bathtub_suction_dildo_remove':
 	dynamic('<<$loc>>_bathtub_dildo = 0')
 	dynamic('<<$loc>>_suction_dildo -= 1')
-    suction_dildo += 1
+    mc_inventory['dildo_suction'] += 1
 
 end
 
@@ -274,7 +274,7 @@ if $ARGS[0] = 'shower_suction_dildo_apply':
 	elseif $bathtype = 'glass shower' or $bathtype = 'glass shower and tub': 
 		dynamic('<<$loc>>_glass_shower_dildo = 1')
 	end
-	suction_dildo -= 1
+	mc_inventory['dildo_suction'] -= 1
 end
 
 if $ARGS[0] = 'shower_suction_dildo_remove':
@@ -284,7 +284,7 @@ if $ARGS[0] = 'shower_suction_dildo_remove':
 	elseif $bathtype = 'glass shower' or $bathtype = 'glass shower and tub': 
 		dynamic('<<$loc>>_glass_shower_dildo = 0')
 	end
-    suction_dildo += 1
+    mc_inventory['dildo_suction'] += 1
 end
 
 if $ARGS[0] = 'bathtub_dildo_check':

locations/sexshop.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 	act 'Adult toys & items': gt 'sexshop', 'sexshop_menu'
 	
 
-	if analplug = 1 and dildo = 1 and hotcat >= 5 and Peter = 0:
+	if mc_inventory['buttplug'] = 1 and mc_inventory['dildo_small'] = 1 and hotcat >= 5 and Peter = 0:
 		if rand(0,1) = 1:
 			'You see an interesting looking middle-aged man. Apparently, he is the owner of this store.'
 

locations/sister_chat.qsrc

@@ -1263,7 +1263,7 @@ if $ARGS[0] = 'bathroom_dildo_talk1':
 		'As you open the door to your room something suddenly comes flying towards you. You jump in surprise and flail, scrambling to catch the incoming projectiles. Somehow, you manage to not drop them, only at that point realizing that they''re two rubber dicks with suction cups at the ends. Wait, aren''t these yours???'
 	end
 	act'Continue':
-		suction_dildo = anyaQW['bathroom_dildos']
+		mc_inventory['dildo_suction'] = anyaQW['bathroom_dildos']
 		anyaQW['bathroom_dildos'] = 0
 		*clr & cla
 		'<center><h1><font color="maroon">Anya</font></h1></center>'
@@ -1278,7 +1278,7 @@ if $ARGS[0] = 'bathroom_dildo_talk1':
 end
 
 if $ARGS[0] = 'bathroom_dildo_talk2':
-	suction_dildo = anyaQW['bathroom_dildos']
+	mc_inventory['dildo_suction'] = anyaQW['bathroom_dildos']
 	anyaQW['bathroom_dildos'] = 0
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'

locations/sitr.qsrc

@@ -79,7 +79,7 @@ act 'Go out on the balcony': gt 'balkon','start'
 
 gs 'events', 'read'
 
-if dildo > 0 and pcs_horny >= 50:
+if mc_inventory['dildo_small'] > 0 and pcs_horny >= 50:
 	act 'Masturbate':
 		*clr & cla
 		if pcs_inhib < 30:inhib_exp += rand(1,3)

locations/sitr2x.qsrc

@@ -73,7 +73,7 @@ act 'Go out on the balcony': gt 'balkon','start'
 
 gs 'events', 'read'
 
-if dildo > 0 and pcs_horny >= 50:
+if mc_inventory['dildo_small'] > 0 and pcs_horny >= 50:
 	act 'Masturbate':
 		*clr & cla
 		if pcs_inhib < 30:inhib_exp += rand(1,3)

locations/sitrPar.qsrc

@@ -170,7 +170,7 @@ if $ARGS[0]= 'sofa':
 	act 'Get up': gt 'sitrPar'
 	act 'Watch TV': gt 'TV','pav'
 
-	if locat['Fam_livingroom'] = 0 and pornMagazine > 0:
+	if locat['Fam_livingroom'] = 0 and mc_inventory['mag_porn'] > 0:
 		'<br>There is a porn magazine under the sofa cushions.'
 		gs 'events', 'read_porn'
 		if pcs_horny >= 50:

locations/soniadisco.qsrc

@@ -1386,7 +1386,7 @@ if $ARGS[0] = 'homesex':
 						'She expertly sucks at your clit and licks your pussy. You don''t know if she has done this a lot or is just a natural, and you really don''t care. As you start moaning a little louder, she stops and puts a finger to your lips. "Shh, don''t wake anyone. Come on, let''s go to my room."'
 						gs 'arousal', 'cuni', 5, 'lesbian'
 						gs 'stat'
-						if strapon = 1 and soniasex = 1:
+						if mc_inventory['strapon'] = 1 and soniasex = 1:
 							act 'Show her your strap-on':
 								*clr & cla
 								gs 'boyStat', 'D<<strapnumber>>'

locations/stol.qsrc

@@ -9,10 +9,10 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'Bric-a-brac drawer.'
 
-	if lubri > 0:'Lubricant, enough for <<lubri>> time(s).'
+	if mc_inventory['lubricant'] > 0:'Lubricant, enough for <<mc_inventory[''lubricant'']>> time(s).'
 	if  mc_inventory['suncream'] > 0:'Sunblock, enough for <<mc_inventory[''suncream'']>> more application(s).'
 	if abonement > 0:'Fitness center subscription, valid for <<abonement>> more visit(s)'
-	if dildo > 0:'Realistic Dildo.'
+	if mc_inventory['dildo_small'] > 0:'Realistic Dildo.'
 
 	if mentats_have > 0:
 		'<a href="exec:dynamic $use_mentats & gt ''stol'', ''start''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
@@ -29,8 +29,8 @@ if $ARGS[0] = 'start':
 	act 'Check birth control': gt 'stol', 'bc'
 	
 	killvar '$stol_loc_temp'
-	if strapon = 1:
-		if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0:
+	if mc_inventory['strapon'] = 1:
+		if 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:
 			act 'Check out your strapon harness': $stol_loc_temp = 'start' & gt 'stol', 'strapon'
 		else
 			act 'Check out your strapon harness': '<br>You don''t have any dildos to attach to your strapon harness'
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 	if mc_inventory['cigarettes'] > 0:
         act 'Hide some cigarettes in your drawer':
             cla
-            cigIN = input ("How many cigarettes do you want to hide in your drawer? (Your purse contains <<mc_inventory[''cigarettes'']>> cigarettes.)")
+            cigIN = input('How many cigarettes do you want to hide in your drawer? (Your purse contains <<mc_inventory[''cigarettes'']>> cigarettes.)')
 
             if cigIN <= 0 or cigIN > mc_inventory['cigarettes']:
                 'You can''t put this amount into the drawer.'
@@ -229,8 +229,8 @@ if $ARGS[0] = 'stolPar':
 	end
 
 	killvar '$stol_loc_temp'
-	if strapon = 1:
-		if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0:
+	if mc_inventory['strapon'] = 1:
+		if 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:
 			act 'Check out your strapon harness': $stol_loc_temp = 'stolPar' & gt 'stol', 'strapon'
 		else
 			act 'Check out your strapon harness': '<br>You don''t have any dildos to attach to your strapon harness'
@@ -240,7 +240,7 @@ if $ARGS[0] = 'stolPar':
 	if mc_inventory['cigarettes'] > 0:
         act 'Hide some cigarettes in your drawer':
             cla
-            cigIN = input ("How many cigarettes do you want to hide in your drawer? (Your purse contains <<mc_inventory[''cigarettes'']>> cigarettes.)")
+            cigIN = input('How many cigarettes do you want to hide in your drawer? (Your purse contains <<mc_inventory[''cigarettes'']>> cigarettes.)')
 
             if cigIN <= 0 or cigIN > mc_inventory['cigarettes']:
                 'You can''t put this amount into the drawer.'
@@ -248,7 +248,6 @@ if $ARGS[0] = 'stolPar':
                 stolcigarettes += cigIN
                 mc_inventory['cigarettes'] -= cigIN
             end
-
             gt 'stol', 'stolPar'
         end
     end
@@ -311,13 +310,13 @@ if $ARGS[0] = 'strapon':
 	*nl
 	if strapnumber = 0: 'Your strapon harness doesn''t have a dildo attached to it.'
 	*nl
-	if dildo = 1: iif(strapnumber = 1, 'Your 10cm dildo is attached to your strapon harness.', '<a href="exec:strapnumber = 1 & gt ''stol'', ''strapon''">Attach</a> your 10cm long dildo.')
-	if middildo = 1: iif(strapnumber = 2, 'Your 15cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 2 & gt ''stol'', ''strapon''">Attach</a> your 15cm long dildo.')
-	if largedildo = 1: iif(strapnumber = 3, 'Your 20cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 3 & gt ''stol'', ''strapon''">Attach</a> your 20cm long dildo.')
-	if bigdildo = 1: iif(strapnumber = 4, 'Your 25cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 4 & gt ''stol'', ''strapon''">Attach</a> your 25cm long dildo.')
-	if extradildo = 1: iif(strapnumber = 5, 'Your 30cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 5 & gt ''stol'', ''strapon''">Attach</a> your 30cm long dildo.')
-	if superdildo = 1: iif(strapnumber = 6, 'Your 35cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 6 & gt ''stol'', ''strapon''">Attach</a> your 35cm long dildo.')
-	if maddildo = 1: iif(strapnumber = 7, 'Your 40cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 7 & gt ''stol'', ''strapon''">Attach</a> your 40cm long dildo.')
+	if mc_inventory['dildo_small'] = 1: iif(strapnumber = 1, 'Your 10cm dildo is attached to your strapon harness.', '<a href="exec:strapnumber = 1 & gt ''stol'', ''strapon''">Attach</a> your 10cm long dildo.')
+	if mc_inventory['dildo_normal'] = 1: iif(strapnumber = 2, 'Your 15cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 2 & gt ''stol'', ''strapon''">Attach</a> your 15cm long dildo.')
+	if mc_inventory['dildo_big'] = 1: iif(strapnumber = 3, 'Your 20cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 3 & gt ''stol'', ''strapon''">Attach</a> your 20cm long dildo.')
+	if mc_inventory['dildo_large'] = 1: iif(strapnumber = 4, 'Your 25cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 4 & gt ''stol'', ''strapon''">Attach</a> your 25cm long dildo.')
+	if mc_inventory['dildo_huge'] = 1: iif(strapnumber = 5, 'Your 30cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 5 & gt ''stol'', ''strapon''">Attach</a> your 30cm long dildo.')
+	if mc_inventory['dildo_enormous'] = 1: iif(strapnumber = 6, 'Your 35cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 6 & gt ''stol'', ''strapon''">Attach</a> your 35cm long dildo.')
+	if mc_inventory['dildo_gigantic'] = 1: iif(strapnumber = 7, 'Your 40cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 7 & gt ''stol'', ''strapon''">Attach</a> your 40cm long dildo.')
 	act 'Back': gt 'stol', $stol_loc_temp
 end
 

locations/uni_dorm.qsrc

@@ -565,7 +565,7 @@ if $ARGS[0] = 'dorm_room':
 	'This is the dorm room you share with Vika.'
 	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room. Your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> sits at the foot of it.'
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
-	if pornMagazine > 0:'You''ve hidden your porn magazines under the mattress of your bed.'
+	if mc_inventory['mag_porn'] > 0:'You''ve hidden your porn magazines under the mattress of your bed.'
 	
 	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_inroom = 1

locations/uni_set_npc_in_uni

@@ -0,0 +1,63 @@
+# uni_set_npc_in_uni
+
+if $ARGS[0] = 'all':
+    gs 'uni_set_npc_in_uni', 'pav'
+    gs 'uni_set_npc_in_uni', 'other'
+    
+elseif $ARGS[0] = 'pav':
+    npc_in_uni['A1']   = 1
+    npc_in_uni['A2']   = 1
+    npc_in_uni['A4']   = 1
+    npc_in_uni['A6']   = 1
+    npc_in_uni['A7']   = 1
+    npc_in_uni['A12']  = 1
+    npc_in_uni['A13']  = 1
+    npc_in_uni['A14']  = 1
+    npc_in_uni['A15']  = 1
+    npc_in_uni['A16']  = 1
+    npc_in_uni['A17']  = 1
+    npc_in_uni['A18']  = 1
+    npc_in_uni['A19']  = 1
+    npc_in_uni['A22']  = 1
+    npc_in_uni['A23']  = 1
+    npc_in_uni['A25']  = 1
+
+    npc_in_uni['A139'] = 1
+    npc_in_uni['A140'] = 1
+    npc_in_uni['A142'] = 1
+    npc_in_uni['A144'] = 1
+    npc_in_uni['A146'] = 1
+    npc_in_uni['A147'] = 1
+    npc_in_uni['A149'] = 1
+    npc_in_uni['A152'] = 1
+    npc_in_uni['A153'] = 1
+    npc_in_uni['A155'] = 1
+    npc_in_uni['A159'] = 1
+    npc_in_uni['A165'] = 1
+
+elseif $ARGS[0] = 'other':
+    npc_in_uni['A77']  = 1
+    npc_in_uni['A82']  = 1
+    npc_in_uni['A83']  = 1
+    npc_in_uni['A84']  = 1
+
+    npc_in_uni['A220'] = 1
+    npc_in_uni['A242'] = 1
+    npc_in_uni['A243'] = 1
+    npc_in_uni['A244'] = 1
+    npc_in_uni['A245'] = 1
+    npc_in_uni['A246'] = 1
+    npc_in_uni['A247'] = 1
+
+end
+
+
+
+
+
+
+
+
+
+
+--- uni_set_npc_in_uni ---------------------------------

locations/vasilyhome.qsrc

@@ -920,7 +920,7 @@ if $ARGS[0] = 'vasily_vodka':
 			end
 			act 'Have another drink': gt 'vasilyhome', 'vasily_vodka'
 		end
-		if strapon = 1 and strapnumber > 0 and vasily['drunk_sex'] > 0 and PCLoSkirt > 0:
+		if mc_inventory['strapon'] = 1 and strapnumber > 0 and vasily['drunk_sex'] > 0 and PCLoSkirt > 0:
 			act 'Pretend to take a swig':
 				*clr & cla
 				vasily['day_drunk'] += 1