Browse Source

[fixed] Some old variables updated to new names

Kevin_Smarts 7 months ago
parent
commit
cc288773fa

+ 2 - 2
locations/LariskaSex.qsrc

@@ -25,10 +25,10 @@ if $ARGS[0] = 'undressed2':
 	if lariskalove >= 12:
 		act 'Play with dildos': gt 'LariskaSex', 'dildo1'
 	end
-	if lariskalove >= 18 and strapon > 0:
+	if lariskalove >= 18 and mc_inventory['strapon'] > 0:
 		act 'Wear your Strap-On': gt 'LariskaSex', 'bj_give_1'
 	end
-	if lariskalove >= 18 and strapon > 0:
+	if lariskalove >= 18 and mc_inventory['strapon'] > 0:
 		act 'Lariska wears the Strap-on': gt 'LariskaSex', 'bj_1'
 	end
 	act 'Get dressed': 

+ 1 - 1
locations/albina_wine_event.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'wine_invite':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You wash up in Albina''s shower, scrubbing the chlorine off your skin before drying off and putting on your clothes.'
-			shampoo += 1
+			mc_inventory['shampoo'] += 1
 			dynamic $showerdin
 			act'Head out':
 				cla & *clr

+ 1 - 1
locations/bedrPar2.qsrc

@@ -115,7 +115,7 @@ end
 if $ARGS[0] = 'momtoy_play':
 	*clr & cla
 	menu_off = 1
-	dildo = 1
+	mc_inventory['dildo_small'] = 1
 	dildohand = 10
 	selfmomtoyplay = 1
 	'<center><img <<$set_imgh>> src="images/shared/sex/mast/start.jpg"></center>'

+ 0 - 1
locations/gadprostitutes.qsrc

@@ -299,7 +299,6 @@ if $ARGS[0] = 'work_alone':
 	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'eroto' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
 
 	!! TODO: The enema thing should be aligned with the rest of the game. 
-	!! NOTE The enema is called klisma (?) that needs to be cleaned up too.
 	if klismaday ! daystart: '<br>Almost no men will like dirty anal sex, even with a condom, and it''s probably a safe bet that they won''t pay a lot for it. So you should start giving yourself an enema before going to work.'
 	if mesec > 0: '<br>You are having your period; most men will pay less for vaginal sex during that time of the month.'
 	if prostitute['cum_dressed'] = 1: '<br>You have visible cum stains on you. Most clients won''t like that and will offer less money.'

+ 1 - 1
locations/husbSex.qsrc

@@ -201,7 +201,7 @@ if $ARGS[0] = 'variant':
 		act 'Ask him to lick you':gt'husbsex','kuni'
 	end
 
-	if harakHusb = 0 and izvratH = 1 and strapon > 0:
+	if harakHusb = 0 and izvratH = 1 and mc_inventory['strapon'] > 0:
 		act 'Use a strapon':gt'husbsex','strapon'
 	end
 end

+ 1 - 1
locations/katjaEvDin.qsrc

@@ -504,7 +504,7 @@ if $ARGS[0] = 'sex':
 	!!	act 'Grab a dildo': gt 'KatjaEvDin', 'dildo'
 	!!end
 
-	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and strapon > 0:
+	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and mc_inventory['strapon'] > 0:
 		act 'Get your strap-on': gt 'KatjaEvDin', 'strapon_start'
 	end
 

+ 1 - 1
locations/katja_party.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] = 'part_dress_check':
 		if pcs_sweat >= 50:
 			'Katja just whiffs her nose. "You need to shower first," she says. "You can use the shower on our floor. Here is a towel and some supplies," Katja adds, handing you a towel and a not-so-small bag of shower utilities.'
 			act 'Go take a shower':
-				noShampoo
+				mc_inventory['noshampoo'] + 1
 				dynamic $showerdin
 				minut += 10
 				'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'

+ 2 - 2
locations/lact_bp.qsrc

@@ -962,8 +962,8 @@ if $ARGS[0] = 'milking':
 				'bp_used_sbottle: <<bp_used_sbottle>>'
 				'milkedvolume: <<milkedvolume>>'
 				'pump_bottletype: <<pump_bottletype>>'
-				'bpbottles: <<bpbottles>>'
-				'bpbottlem: <<bpbottlem>>'
+				'bpbottles: <<mc_inventory[''bottle_s'']>>'
+				'bpbottlem: <<mc_inventory[''bottle_m'']>>'
 			end
 		else
 			'You give it a few more pumps and detach the pump.<br>You filled the bottle with <<milkedvolume/10>>ml of your milk.'

+ 3 - 3
locations/larek.qsrc

@@ -120,11 +120,11 @@ act 'Exit Department':gt'larek','start'
          act 'Exit Department':gt'larek','food'
          end
      end
-     if money>=500 and wine=0 and bag>0:
+     if money >= 500 and mc_inventory['food_wine'] = 0 and bag > 0:
          act 'Buy a bottle of cheap wine (500 RUB)':
          cls
-         money-=500
-         mc_inventory['food_wine']=1
+         money -= 500
+         mc_inventory['food_wine'] = 1
          'You bought a bottle of wine and put it in your purse.'
          act 'Exit Department':gt'larek','food'
          end

+ 20 - 10
locations/natbel_chat.qsrc

@@ -264,16 +264,26 @@ if $ARGS[0] = 'chat':
 						NatbelQW['chrispaid'] = 4
 						gs 'npc_relationship', 'modify', 'A16', 'adore'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha1.jpg"></center>'
-						'"I just wanted to check that there aren''t any more debts," you say to her. "You haven''t forgotten any, have you?"'
-						'Natasha shakes her head. "No, there are no more debts, <<$pcs_nickname>>."'
-						'You give her a quizzical look, "Any more problems with Christina?"'
-						'Hearing her name, Natasha shudders. "No, but I''m doing everything I can to keep my distance from that bully!"'
-						'You nod, "Yeah, that''s a good plan for now. I really need to find a way to deal with her. I''m tired of her and her shit."'
-						'"Please, be careful, <<$pcs_nickname>>. I don''t want to see you getting hurt because of me," Natasha pleads.'
-						'"I will, you don''t have to worry about me," you respond. "She''s my problem to solve."'
-
-						act 'Return to her room': gt 'natbelapt', 'natroom'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/natasha4.jpg"></center>'
+						'You look at Natasha and decide to put her out of her misery regarding Christina, "Okay, I''ve repaid Christina, so you''re all good there. Now that <i>really</i> is your last debt, isn''t it? I don''t want any more nasty surprises."'
+						'"Yes."'
+						'You look at her quizzically, unsure that you really believe her.'
+						'Natasha sees your expression, "Yes, yes, <<$pcs_nickname>>, I swear! I just ran out of money; I was so worried as I had loads of little debts and couldn''t keep track anymore and I was getting pressured for repayment. I repaid all but Christina''s. I was going to do it but Mum needed some help and once I''d done that, I ran out of cash." She continues, "Did... umm, did she say anything?"'
+						act 'Tell her what Christina said':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/natasha1.jpg"></center>'
+							'At this point, even though she''s relieved that her final debt has been cleared, she still seems to be panicking about Christina. She slumps forward with her head in her hands.'
+							'While comforting her, you reply, "Sorry, you mean Christina? No, why would she?"'
+							'"It''s just, umm, I''m so scared of her. She..." Natasha tries to compose herself but fails and starts crying again. "She scares me," she sobs and reaches out for you, hugging you tight. You hug her back, holding her gently until the tears subside.'
+							'"Hey, come on, Natasha. It''s done now, I''ve paid her."'
+							*nl
+							'Natasha looks at you a bit confused, she''s obviously not used to classmates being affectionate towards her. You smile and say, "Well, from here on in, let''s try to change that. Okay?"'
+							'"Okay, <<$pcs_nickname>>," she sniffles. "Thanks!"'
+							'"Good! And one last thing, enough with the tears, okay. I''ve told you, you are a good friend and I like looking out for you," you tell her, smiling reassuringly.'
+							'"Yes, okay, <<$pcs_nickname>>. I''m just not used to this."'
+							act 'Keep talking': gt 'natbel_chat', 'chat'
+							act 'Stop talking': gt 'natbelapt', 'natroom'
+						end
 					end
 				end
 			end

+ 5 - 0
locations/natbel_friend.qsrc

@@ -1,4 +1,9 @@
 # natbel_friend
+
+!!**There will be 2 main paths for this:
+!!**1. Friends only Natasha helping Sveta with homework, no longer doing it for her (option removed), watching TV together, going for walks, doing a job together (flyers in the park), & (later) meeting the cool kids & Jocks at the beach & possibly swim in the lake (skate in winter) plus sauna - Natasha needs a swimsuit.
+!!**2. Love interest (dom/sub) Bi-involving guys.
+!!**Path 1 will always be available even if on route 2.
 !! 2022/08/06 - Alaratt
 
 if $ARGS[0] = 'go_for_walk':

+ 3 - 3
locations/pav_train_market.qsrc

@@ -465,7 +465,7 @@ if ARGS[0] = 4:
 								*clr & cla
 								minut += 5
 								money -= 400
-								pornMagazine = 40
+								mc_inventory['mag_porn'] = 40
 								TimesBuyPorno += 1
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
@@ -489,7 +489,7 @@ if ARGS[0] = 4:
 							*clr & cla
 							minut += 5
 							money -= 400
-							pornMagazine = 40
+							mc_inventory['mag_porn'] = 40
 							TimesBuyPorno += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
@@ -512,7 +512,7 @@ if ARGS[0] = 4:
 							*clr & cla
 							minut += 5
 							money -= 400
-							pornMagazine = 40
+							mc_inventory['mag_porn'] = 40
 							TimesBuyPorno += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'

+ 0 - 1
locations/road_prostitution.qsrc

@@ -29,7 +29,6 @@ if $ARGS[0] = 'work':
 	gs 'road_prostitution', 'road_segment'
 
 	!! TODO: The enema thing should be aligned with the rest of the game.
-	!! NOTE The enema is called klisma (?) that needs to be cleaned up too.
 	if klismaday ! daystart: '<br>Almost no men will like dirty anal sex, even with a condom, and it''s probably a safe bet that they won''t pay a lot for it. You should start giving yourself an enema before going to work.'
 	if mesec > 0: '<br>You are having your period, most men will pay less for vaginal sex during that time of the month.'
 	if prostitute['cum_dressed'] = 1: '<br>You have visible cum stains on you. Most clients won''t like that and will offer less money.'

+ 1 - 1
locations/sex_ev_after.qsrc

@@ -1126,7 +1126,7 @@ if $ARGS[0] = 'cum_clean':
 				end
 			end
 			
-			if salfetka > 0:
+			if mc_inventory['makeup_wipes'] > 0:
 				act'Use your wipes':
 					gs'sex_ev_after', 'wipe_menu'
 					act'Clean everything':

+ 1 - 1
locations/sex_ev_doggy.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'doggy_start':
 						cla & *nl
 						'"Ew!" you grimace. "Could you <i>not</i> spit in my pussy like that?"'
 						'"Just making sure you''re nice and wet," he says, lining himself up with you. You can hear the smile in his voice.'
-						if lubri > 0:'"I have lube you know!" you growl back.'
+						if mc_inventory['lubricant'] > 0:'"I have lube you know!" you growl back.'
 						gs'sex_ev_doggy', 'doggy_insert_slow'
 						!!gs'sex_ev_doggy', 'doggy_goto'
 					end

+ 2 - 2
locations/sex_ev_morning.qsrc

@@ -169,7 +169,7 @@ if $ARGS[0] = 'shower2':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	minut += 10
-	shampoo += 1
+	mc_inventory['shampoo'] += 1
 	dynamic $showerdin
 	gs'stat'
 	'You twist the faucet and hot water comes rushing out, pouring over you, soaking into your skin. Slowly over time, your sleepiness washes away and clarity comes back.'
@@ -186,7 +186,7 @@ if $ARGS[0] = '2nd_shower':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		minut += 5
-		shampoo += 1
+		mc_inventory['shampoo'] += 1
 		dynamic $showerdin
 		gs'stat'
 		'You get into <<$npc_firstname[$boy]>>''s shower for the <i>second</i> time this morning, washing the sex sweat from your body.'

+ 13 - 13
locations/sex_ev_shower.qsrc

@@ -81,7 +81,7 @@ if $ARGS[0] = 'before_alone':
 	minut += 5
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-	noShampoo = 1
+	mc_inventory['noshampoo'] = 1
 	dynamic $showerdin
 	sex_ev['start_shower'] = 1
 	gs 'stat'
@@ -96,7 +96,7 @@ end
 
 if $ARGS[0] = 'before_together1':
 	sex_ev['start_shower'] = 1
-	noShampoo = 1
+	mc_inventory['noshampoo'] = 1
 	dynamic $showerdin
 	gs'arousal', 'massage',5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 	gs'stat'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'before_jerkoff_cum1':
 		'You work him even harder, trying to finish him with one final sprint. <<$npc_firstname[$boy]>> grunts and cum explodes from his tip. The sensation of his cum spattering across your stomach is the last thing you need and you come as well, moaning loudly even as you continue to finish him off.'
 	end
 	act'Continue':
-		noShampoo = 1
+		mc_inventory['noshampoo'] = 1
 		dynamic $showerdin
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/after2.mp4"></video></center>'
@@ -514,7 +514,7 @@ end
 
 if $ARGS[0] = 'after_borrow_shower':
 	cla & *clr
-	NoShampoo = 1
+	mc_inventory['noshampoo'] = 1
 	$sex_ev['bed_room']
 	'"I''m gonna borrow your shower," you say, sliding out of the bed.'
 	if rand(1,10) < npc_sexdrive[$boy] and sex_ev['angry_after'] = 0:
@@ -573,7 +573,7 @@ if $ARGS[0] = 'after_alone':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	sex_ev['shower'] = 1
-	noShampoo = 1
+	mc_inventory['noshampoo'] = 1
 	dynamic $showerdin
 	gs 'stat'
 	'You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off and step out.'
@@ -658,7 +658,7 @@ end
 if $ARGS[0] = 'after_shower_together':
 	sex_ev['shower'] = 1
 	sex_ev['boy_shower'] = 1
-	noShampoo = 1
+	mc_inventory['noshampoo'] = 1
 	dynamic $showerdin
 	cla & *clr
 	gs 'stat'
@@ -1129,7 +1129,7 @@ if $ARGS[0] = 'after_shower_cum_rinse':
 		act'Rinse off':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-			noShampoo = 1
+			mc_inventory['noshampoo'] = 1
 			dynamic $showerdin
 			$orgasm_or = 'no'
 			gs'arousal', 'vaginal_finger',rand(1,2), 'no_orgasm_msg', $sex_ev['prostitution_flag'], 'masturbate'
@@ -1155,7 +1155,7 @@ if $ARGS[0] = 'after_shower_again':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			minut += 5
-			noShampoo = 1
+			mc_inventory['noshampoo'] = 1
 			dynamic $showerdin
 			gs'stat'
 			if sex_ev['shower_fuck'] = 1:
@@ -1182,7 +1182,7 @@ if $ARGS[0] = 'after_shower_again_long':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			minut += 15
-			noShampoo = 1
+			mc_inventory['noshampoo'] = 1
 			dynamic $showerdin
 			gs'stat'
 			if sex_ev['shower_creampie'] = 1:
@@ -1201,7 +1201,7 @@ if $ARGS[0] = 'after_shower_again_long':
 end
 
 if $ARGS[0] = 'after_shower_together_end':
-	noShampoo = 1
+	mc_inventory['noshampoo'] = 1
 	dynamic $showerdin
 	cla & *clr
 	$sex_ev['bath_room']
@@ -1448,7 +1448,7 @@ if $ARGS[0] = 'morning_together_sex1':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
 		gs 'arousal', 'foreplay', 10
-		noShampoo = 1
+		mc_inventory['noshampoo'] = 1
 		dynamic $showerdin
 		'You stay in the shower with <<$npc_firstname[$boy]>> a while longer, allowing him to keep playing with your breasts and fondling your body, but don''t let it progress any further until the water shuts off.'
 		*nl
@@ -1497,7 +1497,7 @@ if $ARGS[0] = 'morning_jerkoff_cum1':
 		'You turn to face him, staring into <<$npc_firstname[$boy]>>''s eyes as you work him even harder trying to finish him with one final sprint. <<$npc_firstname[$boy]>> grunts and cum explodes from his tip. The sensation of his cum spattering across your stomach is the last thing you need and you come as well, moaning loudly even as you continue to finish him off.'
 	end
 	act'Continue':
-		noShampoo = 1
+		mc_inventory['noshampoo'] = 1
 		dynamic $showerdin
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/after2.mp4"></video></center>'
@@ -1805,7 +1805,7 @@ if $ARGS[0] = 'morning_shower_fuck_jerkoff_end':
 end
 
 if $ARGS[0] = 'morning_shower_together_end':
-	noShampoo = 1
+	mc_inventory['noshampoo'] = 1
 	dynamic $showerdin
 	act'Finish up':
 		cla

+ 1 - 1
locations/unused/krutishi.qsrc

@@ -45,7 +45,7 @@ if npc_grupTipe['A<<numnpc>>'] = 1:
 						'Igor whispers to you: "Mistress, I love you so much. Come with me."'
 
 						act 'Go with Igor':
-							if strapon >= 1:
+							if mc_inventory['strapon'] >= 1:
 								gt 'igorev', 'strap on'
 							else
 								gt 'igorev', 'din_sex'

+ 19 - 19
locations/unused/webcam_site.qsrc

@@ -89,7 +89,7 @@ $webcam_help = {
 	One show per day only.
 	Things that will increase your tips: 
 	Use dildos, available from your local sex shop (The larger the better).
-	Self-fisting earns lots of tips, but for this you need lubricant and the ability to take it. Otherwise, you will cause yourself a lot of pain, and you will not be able to put on a show when in pain.
+	Self-fisting earns lots of tips, but for this you need mc_inventory['lubricant']cant and the ability to take it. Otherwise, you will cause yourself a lot of pain, and you will not be able to put on a show when in pain.
 	Orgasming during a show will earn you a bonus tip.
 	'
 	act 'To main': gt 'webcam_site'
@@ -252,7 +252,7 @@ $webcam_show = {
 		!! as is with the additional dildos just merged into existing paths for simplicity. If this file is ever
 		!! added back to the game, there should probably be separate branches for all dildo sizes. At the very
 		!! least, they should give different tip amounts
-		if my_show_throat = 0 and (dildo = 1 or (pcs_throat >= 15 and mc_inventory['dildo_normal'] = 1) or (pcs_throat >= 20 and mc_inventory['dildo_big'] = 1) or (pcs_throat >= 25 and bigdildo = 1) or (pcs_throat >= 30 and mc_inventory['dildo_huge'] = 1) or (pcs_throat >= 35 and mc_inventory['dildo_enormous']	 = 1) or (pcs_throat >= 40 and mc_inventory['dildo_gigantic'] = 1)):
+		if my_show_throat = 0 and (mc_inventory['dildo_small'] = 1 or (pcs_throat >= 15 and mc_inventory['dildo_normal'] = 1) or (pcs_throat >= 20 and mc_inventory['dildo_big'] = 1) or (pcs_throat >= 25 and bigdildo = 1) or (pcs_throat >= 30 and mc_inventory['dildo_huge'] = 1) or (pcs_throat >= 35 and mc_inventory['dildo_enormous']	 = 1) or (pcs_throat >= 40 and mc_inventory['dildo_gigantic'] = 1)):
 			act 'Dildo in the mouth':
 				gs'stat'
 				*clr
@@ -304,7 +304,7 @@ $webcam_show = {
 		!! as is with the additional dildos just merged into existing paths for simplicity. If this file is ever
 		!! added back to the game, there should probably be separate branches for all dildo sizes. At the very
 		!! least, they should give different tip amounts
-		if vgape < 3 and my_show_pussy = 0 and (dildo = 1 or (pcs_vag >= 15 and mc_inventory['dildo_normal'] = 1) or (pcs_vag >= 20 and mc_inventory['dildo_big'] = 1) or (pcs_vag >= 25 and bigdildo = 1) or (pcs_vag >= 30 and mc_inventory['dildo_huge'] = 1) or (pcs_vag >= 35 and mc_inventory['dildo_enormous']	 = 1) or (pcs_vag >= 40 and mc_inventory['dildo_gigantic'] = 1)):
+		if vgape < 3 and my_show_pussy = 0 and (mc_inventory['dildo_small'] = 1 or (pcs_vag >= 15 and mc_inventory['dildo_normal'] = 1) or (pcs_vag >= 20 and mc_inventory['dildo_big'] = 1) or (pcs_vag >= 25 and bigdildo = 1) or (pcs_vag >= 30 and mc_inventory['dildo_huge'] = 1) or (pcs_vag >= 35 and mc_inventory['dildo_enormous']	 = 1) or (pcs_vag >= 40 and mc_inventory['dildo_gigantic'] = 1)):
 			act 'Dildo in the pussy':
 				gs'stat'
 				*clr
@@ -365,7 +365,7 @@ $webcam_show = {
 		!! as is with the additional dildos just merged into existing paths for simplicity. If this file is ever
 		!! added back to the game, there should probably be separate branches for all dildo sizes. At the very
 		!! least, they should give different tip amounts
-		if agape < 3  and my_show_anus = 0 and (dildo = 1 or (pcs_ass >= 15 and mc_inventory['dildo_normal'] = 1) or (pcs_ass >= 20 and mc_inventory['dildo_big'] = 1) or (pcs_ass >= 25 and bigdildo = 1) or (pcs_ass >= 30 and mc_inventory['dildo_huge'] = 1) or (pcs_ass >= 35 and mc_inventory['dildo_enormous']	 = 1) or (pcs_ass >= 40 and mc_inventory['dildo_gigantic'] = 1)):
+		if agape < 3  and my_show_anus = 0 and (mc_inventory['dildo_small'] = 1 or (pcs_ass >= 15 and mc_inventory['dildo_normal'] = 1) or (pcs_ass >= 20 and mc_inventory['dildo_big'] = 1) or (pcs_ass >= 25 and bigdildo = 1) or (pcs_ass >= 30 and mc_inventory['dildo_huge'] = 1) or (pcs_ass >= 35 and mc_inventory['dildo_enormous']	 = 1) or (pcs_ass >= 40 and mc_inventory['dildo_gigantic'] = 1)):
 			act 'Dildo in the ass':
 				gs'stat'
 				*clr
@@ -373,8 +373,8 @@ $webcam_show = {
 				!Butt plug
 				analplugin = 0
 				!grease
-				if lubri > 0:
-					lubri -= 1
+				if mc_inventory['lubricant'] > 0:
+					mc_inventory['lubricant'] -= 1
 					'You squeeze some lube onto your hand and begin to spread it on your hole. After that, you smear a little on your dildo.'
 				end
 				!!Enormous dildos 35cm and 40cm
@@ -432,7 +432,7 @@ $webcam_show = {
 !------------------------------!
 		!! Might be good to differentiate between different dildo sizes here. In particular, maybe there should
 		!! be different tip amounts for larger dildos like there are for the single dildo actions.
-		if max(agape, vgape) < 3 and my_show_dp = 0 and iif(min(pcs_ass, pcs_vag) >= 10, dildo, 0) +  iif(min(pcs_ass, pcs_vag) >= 15, mc_inventory['dildo_normal'], 0) + iif(min(pcs_ass, pcs_vag) >= 20, mc_inventory['dildo_big'], 0) + iif(min(pcs_ass, pcs_vag) >= 25, bigdildo, 0) + iif(min(pcs_ass, pcs_vag) >= 30, mc_inventory['dildo_huge'], 0) + iif(min(pcs_ass, pcs_vag) >= 35, mc_inventory['dildo_enormous']	, 0) + iif(min(pcs_ass, pcs_vag) >= 40, mc_inventory['dildo_gigantic'], 0) >= 2:
+		if max(agape, vgape) < 3 and my_show_dp = 0 and iif(min(pcs_ass, pcs_vag) >= 10, mc_inventory['dildo_small'], 0) +  iif(min(pcs_ass, pcs_vag) >= 15, mc_inventory['dildo_normal'], 0) + iif(min(pcs_ass, pcs_vag) >= 20, mc_inventory['dildo_big'], 0) + iif(min(pcs_ass, pcs_vag) >= 25, bigdildo, 0) + iif(min(pcs_ass, pcs_vag) >= 30, mc_inventory['dildo_huge'], 0) + iif(min(pcs_ass, pcs_vag) >= 35, mc_inventory['dildo_enormous']	, 0) + iif(min(pcs_ass, pcs_vag) >= 40, mc_inventory['dildo_gigantic'], 0) >= 2:
 			act 'Dildo in ass and pussy':
 				gs'stat'
 				*clr
@@ -441,8 +441,8 @@ $webcam_show = {
 				!Butt plug
 				analplugin = 0
 				!grease
-				if lubri > 0:
-					lubri -= 1
+				if mc_inventory['lubricant'] > 0:
+					mc_inventory['lubricant'] -= 1
 					'You then squeeze some lube onto your hand and begin to spread it on them.'
 				end
 				'Now ready, you grab a pair of dildos and begin to rhythmically fuck your holes.'
@@ -476,9 +476,9 @@ $webcam_show = {
 				!Butt plug
 				analplugin = 0
 				!grease
-				if lubri = 0: agape = 3
-				if lubri > 0:
-					lubri -= 1
+				if mc_inventory['lubricant'] = 0: agape = 3
+				if mc_inventory['lubricant'] > 0:
+					mc_inventory['lubricant'] -= 1
 					'You squeeze some lube onto your hand and begin to spread it on your ass.'
 				end
 				'Now ready, you slowly begin to push more and more of your hand inside.'
@@ -503,9 +503,9 @@ $webcam_show = {
 				'You part your legs and begin massaging your hole with your fingers, first one, then two.'
 			
 				!grease
-				if lubri = 0: vgape = 3
-				if lubri > 0:
-					lubri -= 1
+				if mc_inventory['lubricant'] = 0: vgape = 3
+				if mc_inventory['lubricant'] > 0:
+					mc_inventory['lubricant'] -= 1
 					'You squeeze some lube onto your hand and began to smear it on your pussy.'
 				end
 				'Now ready, you slowly begin to push more and more of your hand inside.'
@@ -531,10 +531,10 @@ $webcam_show = {
 				!Butt plug
 				analplugin = 0
 				!grease
-				if lubri = 0: vgape = 1
-				if lubri > 0:
-					lubri -= 1
-					'He forced lubrication his arms and began to lubricate your charms'
+				if mc_inventory['lubricant'] = 0: vgape = 1
+				if mc_inventory['lubricant'] > 0:
+					mc_inventory['lubricant'] -= 1
+					'He forced mc_inventory['lubricant']cation his arms and began to mc_inventory['lubricant']cate your charms'
 				end
 				'For 30 minutes, the two of you fuck on camera, honoring the chat and performing the whims of spectators. Sometimes he fucks you quickly, sometimes slowly, sometimes in your pussy, sometimes in your ass. You even blow him for a bit.'