Browse Source

[added] All sexshop items updated to the new variables

Awesome 8 months ago
parent
commit
b5a98e47a9

+ 28 - 28
locations/Cheatmenu_din.qsrc

@@ -3449,53 +3449,53 @@ $cheatmenu['items'] = {
 			*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>'

+ 8 - 8
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 
 					

+ 4 - 4
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

+ 1 - 1
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>'

+ 1 - 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)

+ 1 - 1
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>'

+ 1 - 1
locations/bedr.qsrc

@@ -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

+ 1 - 1
locations/bedr2x.qsrc

@@ -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

+ 1 - 1
locations/bedrPar.qsrc

@@ -21,7 +21,7 @@ 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 mc_inventory['buttplug'] = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
 			gt 'mother', 'plug_find'

+ 1 - 1
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.'
 

+ 1 - 1
locations/din_bad.qsrc

@@ -235,7 +235,7 @@ if $ARGS[0] = 'd_bag':
 	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 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(dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0, '. You keep your dildos in your desk at home.', ', because you don''t own one.')
+		'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

+ 10 - 10
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>>'] = ''
 		

+ 1 - 1
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
 

+ 15 - 15
locations/kompMFC.qsrc

@@ -1,6 +1,6 @@
 # kompMFC
 
-if mc_inventory['vibe'] = 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..."'
@@ -98,7 +98,7 @@ if mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 						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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 						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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 						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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 						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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 						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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 						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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 						end
 					end
 				end
-				if maddildo = 1:
+				if mc_inventory['dildo_gigantic'] = 1:
 					if pcs_ass >= 35:
 						act 'Use your enormous 40cm dildo':
 							cls
@@ -472,7 +472,7 @@ if mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bi
 				end
 			end
 		end
-		if maddildo = 1:
+		if mc_inventory['dildo_gigantic'] = 1:
 			if pcs_vag >= 30:
 				act 'Use your enormous 40cm dildo':
 					cls

+ 8 - 8
locations/kompMFCanal.qsrc

@@ -3,7 +3,7 @@
 *clr & cla
 gs 'stat'
 'One of the visitors asks: "Do you have a vibrator or dildo? I want to see your ass stuffed..."'
-if mc_inventory['vibe'] = 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'
@@ -50,7 +50,7 @@ if mc_inventory['vibe'] = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or
 				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 mc_inventory['vibe'] = 1 or dildo = 1 or (middildo = 1 and pcs_ass >= 10) or
 				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

+ 5 - 5
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:

+ 1 - 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)

+ 1 - 1
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

+ 1 - 1
locations/lezbsex.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'var':
 		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'

+ 10 - 10
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
 

+ 8 - 8
locations/saveupdater.qsrc

@@ -2034,17 +2034,17 @@ if temp_current_save_version < 00090003:
 	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'
+	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'

+ 9 - 9
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

+ 1 - 1
locations/sexshop.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 	act 'Adult toys & items': gt 'sexshop', 'sexshop_menu'
 	
 
-	if mc_inventory['buttplug'] = 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.'
 

+ 1 - 1
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)

+ 1 - 1
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)

+ 13 - 14
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.'
@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 	
 	killvar '$stol_loc_temp'
 	if mc_inventory['strapon'] = 1:
-		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:
 			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.'
@@ -230,7 +230,7 @@ if $ARGS[0] = 'stolPar':
 
 	killvar '$stol_loc_temp'
 	if mc_inventory['strapon'] = 1:
-		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:
 			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