Переглянути джерело

[changed] updated some more item variables to the new format

Awesome 8 місяців тому
батько
коміт
d6e6211f01

+ 2 - 2
locations/FedorMisc.qsrc

@@ -513,7 +513,7 @@ if $ARGS[0] = 'Smoke':
 	*clr & cla
 	menu_off = 1
 	npc_rel['A5'] += 5
-	siga += 1
+	mc_inventory['cigarettes'] += 1
 	gs 'drugs', 'smoke'
 	cumspclnt = 2
 	gs 'cum_cleanup'
@@ -531,7 +531,7 @@ if $ARGS[0] = 'Smoke 2':
 	*clr & cla
 	menu_off = 1
 	npc_rel['A5'] += 5
-	siga += 1
+	mc_inventory['cigarettes'] += 1
 	gs 'drugs', 'smoke'
 	cumspclnt = 2
 	gs 'cum_cleanup'

+ 1 - 1
locations/balkon.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'start':
 	
 	act 'Approach the railing':gt 'balkon2', 'niz'
 	
-	if siga >= 1: act 'Light a cigarette':gt 'balkon2', 'kurit'
+	if mc_inventory['cigarettes'] >= 1: act 'Light a cigarette':gt 'balkon2', 'kurit'
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt 'balkon', 'start'
 	if pcs_horny >= 50 and pcs_inhib > 30: act 'Masturbate':gt 'balkon2', 'masopt'	
 end

+ 5 - 5
locations/booty_call_after.qsrc

@@ -1073,7 +1073,7 @@ if $ARGS[0] = 'after_sex2':
 	
 	act'Use his bathroom':gt'booty_call_after', 'boy_bathroom'
 		
-	if booty_call['cigarette'] = 0 and (siga > 0 or npc_smoker[$boy] > 0) and booty_call['npc_late'] ! 1:
+	if booty_call['cigarette'] = 0 and (mc_inventory['cigarettes'] > 0 or npc_smoker[$boy] > 0) and booty_call['npc_late'] ! 1:
 		act'Smoke a cigarette':cla & gs'booty_call_after', 'smoke_ciga1'
 	end
 
@@ -1214,7 +1214,7 @@ if $ARGS[0] = 'boy_bathroom':
 				act'Continue':gs'booty_call_after', 'boy_bathroom'
 			end
 			
-			if siga > 0:
+			if mc_inventory['cigarettes'] > 0:
 				act'Smoke to pass the time':
 					gs 'drugs', 'smoke'
 					gs'stat'
@@ -1483,7 +1483,7 @@ end
 if $ARGS[0] = 'smoke_ciga1':
 	act'Never mind': cla & gs'booty_call_after', 'after_sex2'
 
-	if siga > 0 and booty_call['angry_after'] = 0:
+	if mc_inventory['cigarettes'] > 0 and booty_call['angry_after'] = 0:
 		act'One of yours':gt'booty_call_after', 'smoke_ciga2'
 
 		act'Play with your phone':
@@ -1494,7 +1494,7 @@ if $ARGS[0] = 'smoke_ciga1':
 	
 	act'Bum a cigarette':
 		booty_call['bum_cigarette'] = 1
-		siga += 1
+		mc_inventory['cigarettes'] += 1
 		siga_bum = 1
 		gt'booty_call_after', 'smoke_ciga_bum'
 	end
@@ -1502,7 +1502,7 @@ if $ARGS[0] = 'smoke_ciga1':
 	act'Bum a cigarette and play with your phone':
 		booty_call['bum_cigarette'] = 1
 		booty_call['cigarette'] = 3
-		siga += 1
+		mc_inventory['cigarettes'] += 1
 		siga_bum = 1
 		gt'booty_call_after', 'smoke_ciga_bum'
 	end

+ 2 - 2
locations/booty_call_sex.qsrc

@@ -777,7 +777,7 @@ end
 
 if $ARGS[0] = 'ciga_break':
 	if booty_call['smoke_break'] = 0:
-		if siga > 0:
+		if mc_inventory['cigarettes'] > 0:
 			act'Have a smoke':
 				cla & *clr
 				booty_call['smoke_break'] = 1
@@ -813,7 +813,7 @@ if $ARGS[0] = 'ciga_break':
 				cla & *clr
 				booty_call['smoke_break'] = 1
 				if npc_smoker[$boy] > 0 and rand(1,20) < 20:
-					siga += 1
+					mc_inventory['cigarettes'] += 1
 					siga_bum = 1
 					gs 'drugs', 'smoke'
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'

+ 3 - 3
locations/drugs.qsrc

@@ -1,7 +1,7 @@
 # drugs
 
 !! How to use:
-!! Smoking: gs 'drugs', 'smoke' (if it isn''t svetas cigarette, you have to add siga += 1)
+!! Smoking: gs 'drugs', 'smoke' (if it isn''t svetas cigarette, you have to add mc_inventory['cigarettes'] += 1)
 !! Joint/Weed: gs 'drugs', 'joint' (if it isn''t svetas joint, you have to add joint += 1)
 !! Heroin: gs 'drugs', 'heroin'
 !! Cocaine: gs 'drugs', 'cocaine' (if it isn''t svetas cocaine, you have to add dur += 1)
@@ -20,7 +20,7 @@ if $ARGS[0] = 'smoke':
 		smoker += 1
 		if smoker > 20 and smoke_exp = 0: smoke_exp = 1
 	end
-	siga -= 1
+	mc_inventory['cigarettes'] -= 1
 	smokeDay = daystart
 	smokeHour = hour
 	smokeminut = minut + 3
@@ -39,7 +39,7 @@ if $ARGS[0] = 'smoke':
 	gs 'stat'
 	if siga_bum = 1:
 		siga_bum = 0
-	elseif siga = 0:
+	elseif mc_inventory['cigarettes'] = 0:
 		msg'That was your last cigarette.'
 	end
 	

+ 2 - 2
locations/gschool_boys_bathroom.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 			act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
 		end
 	end
-	if siga > 0:
+	if mc_inventory['cigarettes'] > 0:
 		act 'Have a smoke':
 			*clr & cla
 			menu_off = 1
@@ -233,7 +233,7 @@ if $ARGS[0] = 'boy2':
 				act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
 			end
 		end
-		if siga > 0:
+		if mc_inventory['cigarettes'] > 0:
 			act 'Yes':
 				*clr & cla
 				gs 'drugs','smoke'

+ 1 - 1
locations/gschool_break.qsrc

@@ -103,7 +103,7 @@ if $ARGS[0] = 'restroom_actions':
 	end
 	gs 'din_van', 'pblc_pee'
 	act 'Use the mirrors': gt 'mirror', 'start'
-	if siga > 0:		
+	if mc_inventory['cigarettes'] > 0:		
 		act 'Smoke':
 			if rand(0,4) = 0:
 				gt 'gschool_break', 'smoke2'

+ 2 - 2
locations/gschool_girls_bathroom.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 			act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 		end
 	end
-	if siga > 0:
+	if mc_inventory['cigarettes'] > 0:
 		act 'Smoke':
 			*clr & cla
 			menu_off = 1
@@ -107,7 +107,7 @@ if $ARGS[0] = 'bathroom3':
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	end
-	if siga > 0:
+	if mc_inventory['cigarettes'] > 0:
 		act 'Smoke':
 			*clr & cla
 			menu_off = 1

+ 1 - 1
locations/gschool_lessons4.qsrc

@@ -1941,7 +1941,7 @@ if $ARGS[0] = 'post_dress':
 		end
 	end
 	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'start'
-	if siga >= 1:
+	if mc_inventory['cigarettes'] >= 1:
 		act 'Smoke a cigarette':
 			*clr & cla
 			gs 'drugs', 'smoke', 1

+ 1 - 1
locations/hookahlounge.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'Smoke_Hookah':
 		smoketab = 0
 		minut += 60
 		gs 'stat'
-		siga += 1
+		mc_inventory['cigarettes'] += 1
 		gs 'drugs', 'smoke', 1
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/hookahlounge/HookahSmoke.jpg"></center>'
 		'You smoke using the hookah'

+ 5 - 5
locations/hookup_after.qsrc

@@ -853,7 +853,7 @@ if $ARGS[0] = 'light_cigarette':
 				'"Well it''s a good thing I paid up front then," you smile back, plucking one from his pack.' 
 				act'Continue':
 					cla & *clr
-					siga += 1
+					mc_inventory['cigarettes'] += 1
 					siga_bum = 1
 					gs 'drugs', 'smoke'
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
@@ -862,7 +862,7 @@ if $ARGS[0] = 'light_cigarette':
 					gs 'hookup_talk', 'pillow_talk2'
 				end
 			end
-			if siga > 0:
+			if mc_inventory['cigarettes'] > 0:
 				act'Have a smoke':
 					hookup['cigarette'] = 5
 					cla & *clr
@@ -881,7 +881,7 @@ if $ARGS[0] = 'light_cigarette':
 				end
 			end
 		end
-		if siga > 0:
+		if mc_inventory['cigarettes'] > 0:
 			act'Have a smoke':
 				hookup['cigarette'] = 4
 				cla & *clr
@@ -911,7 +911,7 @@ if $ARGS[0] = 'light_cigarette2':
 		'"Well it''s a good thing I paid up front then," you smile back, plucking one from his pack.' 
 		act'Continue':
 			cla & *clr
-			siga += 1
+			mc_inventory['cigarettes'] += 1
 			siga_bum = 1
 			gs 'drugs', 'smoke'
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
@@ -920,7 +920,7 @@ if $ARGS[0] = 'light_cigarette2':
 			gs 'hookup_talk', 'pillow_talk2'
 		end
 	end
-	if siga > 0:
+	if mc_inventory['cigarettes'] > 0:
 		act'Have a smoke':
 			hookup['cigarette'] = 5
 			cla & *clr

+ 1 - 1
locations/hookup_talk.qsrc

@@ -1111,7 +1111,7 @@ if $ARGS[0] = 'period_no_pregnant':
 end
 
 if $ARGS[0] = 'need_smoke':
-	if siga > 0:
+	if mc_inventory['cigarettes'] > 0:
 		act'I need a cigarette':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'

+ 5 - 5
locations/hunter_interactions.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 			*nl 'You follow them outside, they give you a cigarette, you light it and smoke it...'
 			if huntersKnowSlut = 0: huntersAndreiQw += 1 & huntersIgorQw += 1 & huntersSergeiQw += 1
 			minut += 15
-			siga += 1
+			mc_inventory['cigarettes'] += 1
 			gs 'drugs', 'smoke'
 			gs 'stat'
 
@@ -35,7 +35,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 				*nl 'The two of you walk outside, Andrei hands you a cigarette. You start talking about your feelings for each other.'
 				minut += 15
-				siga += 1
+				mc_inventory['cigarettes'] += 1
 				gs 'drugs', 'smoke'
 				huntersAndreiQw += 1
 				gs 'stat'
@@ -55,7 +55,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 						'You watch in disbelief, he''s clearly not joking around. You can see on Andrei''s facial expression that he''s being dead serious.'
 						'"I won''t tell anybody about this, don''t worry, no one will know." he adds quickly. "Well, <<$pcs_nickname>>, what do you say?'
 						minut += 15
-						siga += 1
+						mc_inventory['cigarettes'] += 1
 						gs 'drugs', 'smoke'
 						huntersAndreiQw += 1
 						gs 'stat'
@@ -146,7 +146,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 			*nl 'You followed Sergei outside. He gives you a cigarette, and the two of you continue on with your conversation.'
 			minut += 15
-			siga += 1
+			mc_inventory['cigarettes'] += 1
 			gs 'drugs', 'smoke'
 			if huntersKnowSlut = 0:huntersSergeiQw += 1
 			gs 'stat'
@@ -163,7 +163,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 			*nl 'You followed Igor outside. He gives you a cigarette, and the two of you continue on with your conversation.'
 			minut += 15
-			siga += 1
+			mc_inventory['cigarettes'] += 1
 			gs 'drugs', 'smoke'
 			if huntersKnowSlut = 0:huntersIgorQw += 1
 			gs 'stat'

+ 1 - 1
locations/intro_city_select.qsrc

@@ -933,7 +933,7 @@ if $ARGS[0] = 'gopnik':
 	mc_inventory['cosmetics'] = 10
 	mc_inventory['shampoo'] =  20
 	mc_inventory['razor'] =  10
-	siga = 20
+	mc_inventory['cigarettes'] = 20
 	fakepassport = 1
 	pirsC = 1
 	PirsC1_owned = 1

+ 1 - 1
locations/intro_customization.qsrc

@@ -219,7 +219,7 @@ if $ARGS[0] = 'modite_mis':
 	'<center><b>Misc items</b></center>'
 	*nl
 	killvar '$table_display'
-	gs 'intro_customization', 'modrel_setup2', 'siga', 'Cigarettes'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''cigarettes'']', 'Cigarettes'
 	gs 'intro_customization', 'modrel_setup2', 'dur', 'Cocaine'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''food_biscuits'']', 'Tea Biscuits'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'

+ 1 - 1
locations/intro_sg_select.qsrc

@@ -1013,7 +1013,7 @@ if $ARGS[0] = 'gopnik':
 	mc_inventory['razor'] =  10
 	mc_inventory['sanitary_pads'] = 30
 	mc_inventory['tampons'] =  10
-	siga = 20
+	mc_inventory['cigarettes'] = 20
 	fakepassport = 1
 	pirsC = 1
 	PirsC1_owned = 1

+ 1 - 1
locations/intro_sg_select_custom.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] = 'none':
 	pirsC = 0	
 	PirsC1_owned = 0
 	mc_inventory['shampoo'] =  0	
-	siga = 0	
+	mc_inventory['cigarettes'] = 0	
 	mc_inventory['razor'] =  0
 	swim_start = 0	
 	mc_inventory['tampons'] =  0

+ 4 - 4
locations/pav_aptcourtev.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'bench':
 	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'
 	act 'Play on your phone': gt 'pav_aptcourtev', 'phone'
-	if siga > 0: act 'Smoke': gt 'pav_aptcourtev', 'smoke'
+	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'
 end
 
@@ -96,7 +96,7 @@ if $ARGS[0] = 'smoke':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/benchsmoke.jpg"></center>'
 	'You take out a pack of smokes and light a cigarette before taking a long slow drag off it as you relax on the bench.'
 	act 'Get up': gt 'pav_complex', 'start'
-	if siga > 0: act 'Have another cigarette': gt 'pav_aptcourtev', 'smoke'
+	if mc_inventory['cigarettes'] > 0: act 'Have another cigarette': gt 'pav_aptcourtev', 'smoke'
 end
 
 if $ARGS[0] = 'smoke_joint':
@@ -335,7 +335,7 @@ if $ARGS[0] = 'events1':
 				act 'Smoke with the boys':
 					*clr & cla
 					minut += 10
-					siga += 1
+					mc_inventory['cigarettes'] += 1
 					gs 'drugs', 'smoke'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boysmoke2.jpg"></center>'
@@ -678,7 +678,7 @@ if $ARGS[0] = 'events2':
 				act 'Smoke with the boys':
 					*clr & cla
 					minut += 10
-					siga += 1
+					mc_inventory['cigarettes'] += 1
 					gs 'drugs', 'smoke'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boysmoke2.jpg"></center>'

+ 4 - 4
locations/pod_ezd.qsrc

@@ -800,7 +800,7 @@ if $ARGS[0] = 'boys_smoke':
 	act 'Take the cigarette':
 		*clr & cla
 		minut += 5
-		siga += 1
+		mc_inventory['cigarettes'] += 1
 		gs 'drugs', 'smoke'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/smokeboys.jpg"></center>'
@@ -1074,7 +1074,7 @@ if $ARGS[0] = 'vasily_smoke':
 		end
 		act 'Suck him off quickly': gt 'pod_ezd', 'vasily_smoke_bj'
 	else
-		siga += 1
+		mc_inventory['cigarettes'] += 1
 		gs 'drugs','smoke'
 		minut +=5
 		'You see Vasily standing in the stairwell, smoking a cigarette. You approach him and ask: "Hi Shulga, do you have a cigarette for me? I could really use a smoke right now."'
@@ -1112,7 +1112,7 @@ end
 if $ARGS[0] = 'smoke_danvas':
 	*clr & cla
 	menu_off = 1
-	siga += 1
+	mc_inventory['cigarettes'] += 1
 	gs 'drugs','smoke'
 	minut +=5
 	gs 'stat'
@@ -1267,7 +1267,7 @@ end
 if $ARGS[0] = 'smoke_vitdanvas':
 	*clr & cla
 	menu_off = 1
-	siga += 1
+	mc_inventory['cigarettes'] += 1
 	gs 'drugs','smoke'
 	minut +=5
 	gs 'stat'

+ 5 - 5
locations/sex_ev_after.qsrc

@@ -1297,7 +1297,7 @@ if $ARGS[0] = 'after_sex2':
 	
 	act'Use his bathroom':gt'sex_ev_after', 'boy_bathroom'
 		
-	if sex_ev['cigarette'] = 0 and (siga > 0 or npc_smoker[$boy] > 0) and sex_ev['npc_late'] ! 1:
+	if sex_ev['cigarette'] = 0 and (mc_inventory['cigarettes'] > 0 or npc_smoker[$boy] > 0) and sex_ev['npc_late'] ! 1:
 		act'Smoke a cigarette':cla & gs'sex_ev_after', 'smoke_ciga1'
 	end
 
@@ -1436,7 +1436,7 @@ if $ARGS[0] = 'boy_bathroom':
 				act'Continue':gs'sex_ev_after', 'boy_bathroom'
 			end
 			
-			if siga > 0:
+			if mc_inventory['cigarettes'] > 0:
 				act'Smoke to pass the time':
 					gs 'drugs', 'smoke'
 					gs'stat'
@@ -1716,7 +1716,7 @@ end
 if $ARGS[0] = 'smoke_ciga1':
 	act'Never mind': cla & gs'sex_ev_after', 'after_sex2'
 
-	if siga > 0 and sex_ev['angry_after'] = 0:
+	if mc_inventory['cigarettes'] > 0 and sex_ev['angry_after'] = 0:
 		act'One of yours':gt'sex_ev_after', 'smoke_ciga2'
 
 		act'Play with your phone':
@@ -1727,7 +1727,7 @@ if $ARGS[0] = 'smoke_ciga1':
 	
 	act'Bum a cigarette':
 		sex_ev['bum_cigarette'] = 1
-		siga += 1
+		mc_inventory['cigarettes'] += 1
 		siga_bum = 1
 		gt'sex_ev_after', 'smoke_ciga_bum'
 	end
@@ -1735,7 +1735,7 @@ if $ARGS[0] = 'smoke_ciga1':
 	act'Bum a cigarette and play with your phone':
 		sex_ev['bum_cigarette'] = 1
 		sex_ev['cigarette'] = 3
-		siga += 1
+		mc_inventory['cigarettes'] += 1
 		siga_bum = 1
 		gt'sex_ev_after', 'smoke_ciga_bum'
 	end

+ 2 - 2
locations/sex_ev_sex.qsrc

@@ -984,7 +984,7 @@ end
 
 if $ARGS[0] = 'ciga_break':
 	if sex_ev['smoke_break'] = 0:
-		if siga > 0:
+		if mc_inventory['cigarettes'] > 0:
 			act'Have a smoke':
 				cla & *clr
 				sex_ev['smoke_break'] = 1
@@ -1033,7 +1033,7 @@ if $ARGS[0] = 'ciga_break':
 				cla & *clr
 				sex_ev['smoke_break'] = 1
 				if npc_smoker[$boy] > 0 and rand(1,20) < 20:
-					siga += 1
+					mc_inventory['cigarettes'] += 1
 					siga_bum = 1
 					gs 'drugs', 'smoke'
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'

+ 11 - 11
locations/stat_display.qsrc

@@ -1383,16 +1383,16 @@ if cheatStatusIcons = 0:
 
 	!!Row 5: Drugs and other short term stuff
 
-	if siga > 0:
-		$stat_smoker_msg = 'You have <<siga>> cigarette'+iif(siga = 1, '', 's')+iif(smokerNeed > 0 and NarkImmune = 0, ' and you want to smoke.' , '.')
+	if mc_inventory['cigarettes'] > 0:
+		$stat_smoker_msg = 'You have <<mc_inventory[''cigarettes'']>> cigarette'+iif(mc_inventory['cigarettes'] = 1, '', 's')+iif(smokerNeed > 0 and NarkImmune = 0, ' and you want to smoke.' , '.')
 		$statusIconBarTab += '<td><a href="exec:msg $stat_smoker_msg"><img title="<<$stat_smoker_msg>>" height = <<set_siconht>> src="images/system/icons/status/cigarettes.png"></a></td>'
 	end
 
-	if smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and siga > 0:
+	if smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and mc_inventory['cigarettes'] > 0:
 		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="You really need to smoke, click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
-	elseif smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and siga <= 0:
+	elseif smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and mc_inventory['cigarettes'] <= 0:
 		$statusIconBarTab += '<td><a href="exec:msg ''You really need to smoke, but you have no cigarettes.''"><img title="You really need to smoke, but you have no cigarettes." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
-	elseif siga > 0:
+	elseif mc_inventory['cigarettes'] > 0:
 		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="Click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/smoke_cigarette.png"></a></td>'
 	end
 
@@ -1854,20 +1854,20 @@ if enable_extra_msg = 1:
 
 	if smoker >= 20 and NarkImmune = 0:
 		if smokerNeed > 0:
-			if siga > 0:
-				$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color="red"><b>You want to smoke. You have <<siga>> cigarettes left.</b></font></a><BR>'
+			if mc_inventory['cigarettes'] > 0:
+				$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color="red"><b>You want to smoke. You have <<mc_inventory[''cigarettes'']>> cigarettes left.</b></font></a><BR>'
 			else
 				$stat_msg += '<BR><font color="red"><b>You want to smoke, but you have no cigarettes left.</b></font><BR>'
 			end
 		else
-			if siga > 0:
-				$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<siga>> cigarettes left.</b></font></a><BR>'
+			if mc_inventory['cigarettes'] > 0:
+				$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<mc_inventory[''cigarettes'']>> cigarettes left.</b></font></a><BR>'
 			else
 				$stat_msg += '<BR><font color=#0064FF><b>You feel like you should get some cigarettes.</b></font><BR>'
 			end
 		end
-	elseif siga > 0:
-		$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<siga>> cigarettes.</b></font></a><BR>'
+	elseif mc_inventory['cigarettes'] > 0:
+		$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<mc_inventory[''cigarettes'']>> cigarettes.</b></font></a><BR>'
 	end
 
 	if smokeHour = hour and smokeday = daystart and smokeminut >= minut: $stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'

+ 10 - 10
locations/stol.qsrc

@@ -37,16 +37,16 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
-	if siga > 0:
+	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 <<siga>> 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 > siga:
+            if cigIN <= 0 or cigIN > mc_inventory['cigarettes']:
                 'You can''t put this amount into the drawer.'
             else
                 stolcigarettes += cigIN
-                siga -= cigIN
+                mc_inventory['cigarettes'] -= cigIN
             end
 
             gt 'stol', 'start'
@@ -62,7 +62,7 @@ if $ARGS[0] = 'start':
                 'You can''t take this amount from your drawer.'
             else
                 stolcigarettes -= cigOUT
-                siga += cigOUT
+                mc_inventory['cigarettes'] += cigOUT
             end
 
             gt 'stol', 'start'
@@ -237,16 +237,16 @@ if $ARGS[0] = 'stolPar':
 		end
 	end
 	
-	if siga > 0:
+	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 <<siga>> 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 > siga:
+            if cigIN <= 0 or cigIN > mc_inventory['cigarettes']:
                 'You can''t put this amount into the drawer.'
             else
                 stolcigarettes += cigIN
-                siga -= cigIN
+                mc_inventory['cigarettes'] -= cigIN
             end
 
             gt 'stol', 'stolPar'
@@ -262,7 +262,7 @@ if $ARGS[0] = 'stolPar':
                 'You can''t take this amount from your drawer.'
             else
                 stolcigarettes -= cigOUT
-                siga += cigOUT
+                mc_inventory['cigarettes'] += cigOUT
             end
 
             gt 'stol', 'stolPar'