[changed] Mass variable migration surrounding "drugs". This includes an experimental move of stat, hourly_events, and cikl. Almost certain something's going to break. My bad

locations/Cheatmenu_din.qsrc

@@ -298,20 +298,21 @@ $cheatmenu['bodyMod'] = {
 }
 
 $cheatmenu['addict'] = {
-	if NarkImmune = 0:
-		NarkImmune = 1
-		smoker = 0
-		smokerNeed = 0
-		joint_count = 0
-		alcohol_count = 0
-		cocaine_count = 0
-		amphetamine_count = 0
-		SNarkTimes = 0
+	if drugVars['cheat_immune'] = 0:
+		drugVars['cheat_immune'] = 1
+		drugVars['cigarettes_used'] = 0
+		drugVars['cigarettes_need'] = 0
+		drugVars['weed_used'] = 0
+		drugVars['alcohol_used'] = 0
+		drugVars['cocaine_used'] = 0
+		drugVars['amphetamine_used'] = 0
+		drugVars['heroin_used'] = 0
 		dynamic $cheatmenu['permanent']
 		exit
-	elseif NarkImmune = 1:
-		NarkImmune = 0
+	elseif drugVars['cheat_immune'] = 1:
+		drugVars['cheat_immune'] = 0
 		dynamic $cheatmenu['permanent']
+		exit
 	end
 }
 
@@ -431,12 +432,12 @@ $cheatmenu['exhib_block'] = {
 $cheatmenu['addictive_block'] = {
 	if addictive_cheat = 0:
 		addictive_cheat = 1
-		smoke_exp = 0
-		joint_exp = 0
-		heroin_exp = 0
-		cocaine_exp = 0
-		amphetamine_exp = 0
-		alcohol_exp = 0
+		drugVars['cigarettes_exp'] = 0
+		drugVars['weed_exp'] = 0
+		drugVars['heroin_exp'] = 0
+		drugVars['cocaine_exp'] = 0
+		drugVars['amphetamine_exp'] = 0
+		drugVars['alcohol_exp'] = 0
 		addictive_exp = 0
 		addictive_trait_lvl = 0
 		dynamic $cheatmenu['permanent']
@@ -553,8 +554,8 @@ $cheatmenu['permanent'] = {
 	if cheatHealth = 1: $cheatHealth = 'Disabled'
 	if cheatPee = 0: $cheatPee = 'Enabled'
 	if cheatPee = 1: $cheatPee = 'Disabled'
-	if NarkImmune = 0: $NarkImmune = 'Currently OFF'
-	if NarkImmune = 1: $NarkImmune = 'Currently ON'
+	if drugVars['cheat_immune'] = 0: $drugVars['cheat_immune_text'] = 'Currently OFF'
+	if drugVars['cheat_immune'] = 1: $drugVars['cheat_immune_text'] = 'Currently ON'
 	if InfWillpwer = 0: $InfWillpwer = 'Currently OFF'
 	if InfWillpwer = 1: $InfWillpwer = 'Currently ON'
 	if cheatSlut = 0: $cheatSlut = 'Enabled'
@@ -612,7 +613,7 @@ $cheatmenu['permanent'] = {
 	'Never unhappy: <a href="exec:dynamic $cheatmenu[''noMood'']"><<$cheatNoMood>></a>'
 	'Never lose or gain weight: <a href="exec:dynamic $cheatmenu[''noFat'']"><<$cheatNoFat>></a>'
 	'Bust and butt unaffected by weight: <a href="exec: dynamic $cheatmenu[''static_assets'']"><<$bodyVars[''cheat_staticAssets_text'']>></a>'
-	'Never get addicted: <a href="exec:dynamic $cheatmenu[''addict'']"><<$NarkImmune>></a>'
+	'Never get addicted: <a href="exec:dynamic $cheatmenu[''addict'']"><<$drugVars[''cheat_immune_text'']>></a>'
 	'Never shave legs: <a href="exec:dynamic $cheatmenu[''shaveLegs'']"><<$cheatShaveLegs>></a>'
 
 	if Enable_sforma = 1:
@@ -714,7 +715,7 @@ $cheatmenu['state'] = {
 		'<b>You need to open a bank account before getting access to change money in the bank</b>'
 	end
 	'<a href="exec:dynamic $cheatmenu[''std_cure''] & gs ''stat''">Cure all stds</a>'
-	'<a href="exec:vgape = 0 & agape = 0 & nippain = 0 & painpub = 0 & pirs_pain_ton = 0 & mesec = 0 & spanked = 0 & SLomka = 0 & Narkoman = 0 & strongnark = 0 & SNarkTimes = 0 & nark = 0 & fingal = 0 & mosol = 0 & frost = 0 & sick = 0 & hypnoAddict = 0 & hypnoWithdrawal = 0 & dynamic $cheatmenu[''std_cure''] & dynamic $cheatmenu[''pain_killer''] & gs ''stat''">Cure all ailments.</a>'
+	'<a href="exec:vgape = 0 & agape = 0 & nippain = 0 & painpub = 0 & pirs_pain_ton = 0 & mesec = 0 & spanked = 0 & drugVars[''heroin_need''] = 0 & drugVars[''cocaine_addict''] = 0 & drugVars[''heroin_high''] = 0 & drugVars[''heroin_used''] = 0 & drugVars[''cocaine_system''] = 0 & fingal = 0 & mosol = 0 & frost = 0 & sick = 0 & hypnoAddict = 0 & hypnoWithdrawal = 0 & dynamic $cheatmenu[''std_cure''] & dynamic $cheatmenu[''pain_killer''] & gs ''stat''">Cure all ailments.</a>'
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''force_preg''] & gs ''stat''">Force random pregnancy</a>'
 	'<a href="exec:dynamic $cheatmenu[''remove_preg''] & gs ''stat''">Remove pregnancy</a>'
@@ -3195,14 +3196,14 @@ $cheatmenu['vartracker'] = {
 	'min_arousal: <<min_arousal>>'
 	'pcs_nips: <<pcs_nips>>'
 	'clit_size: <<clit_size>>'
-	'steroid_have: <<steroid_have>>'
-	'steroid_counter: <<steroid_counter>>'
-	'steroid_dose: <<steroid_dose>>'
-	'aphrodisiac_have: <<aphrodisiac_have>>'
+	'steroids: <<mc_inventory[''steroids'']>>'
+	'steroids_used: <<drugVars[''steroids_used'']>>'
+	'steroid_dose: <<drugVars[''steroids_dose'']>>'
+	'aphrodisiac pills: <<mc_inventory[''aphrodisiac'']>>'
 	'aphrodisiac_counter: <<aphrodisiac_counter>>'
-	'aphrodisiac_timer: <<aphrodisiac_timer>>'
-	'aphrodisiac_addiction: <<aphrodisiac_addiction>>'
-	'bcream_have: <<bcream_have>>'
+	'aphrodisiac_timer: <<drugVars[''aphrodisiac_timer'']>>'
+	'aphrodisiac_addiction: <<drugVars[''aphrodisiac_addict'']>>'
+	'breastcream: <<mc_inventory[''breastcream'']>>'
 	'motherQW: <<npc_QW[''A29'']>>'
 	'Anastasia quest level: <<npc_QW[''A192'']>>'
 	'sex: <<stat[''vaginal'']>>'
@@ -3805,13 +3806,13 @@ $cheatmenu['items'] = {
 	if showNarcoticsItems = 1:
 		'<a href = "exec: showNarcoticsItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
 		*pl 'Cigarettes: <a href="exec:mc_inventory[''cigarettes'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''cigarettes'']>> </b></a>'
-		*pl 'Joints: <a href="exec:joint=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<joint>> </b></a>'
-		*pl 'Cocaine: <a href="exec:dur=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<dur>> </b></a>'
-		*pl 'Amphetamine: <a href="exec:amphetamine=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<amphetamine>> </b></a>'
-		*pl 'Neuroboosters: <a href="exec:mentats_have=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mentats_have>> </b></a>'
-		*pl 'Steroids: <a href="exec:steroid_have=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<steroid_have>> </b></a>'
-		*pl 'Breast cream: <a href="exec:bcream_have=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<bcream_have>> </b></a>'
-		*pl 'Aphrodisiacs: <a href="exec:aphrodisiac_have=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<aphrodisiac_have>> </b></a>'
+		*pl 'Joints: <a href="exec:mc_inventory[''joints'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''joints'']>> </b></a>'
+		*pl 'Cocaine: <a href="exec:mc_inventory[''cocaine'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''cocaine'']>> </b></a>'
+		*pl 'Amphetamine: <a href="exec:mc_inventory[''amphetamine'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''amphetamine'']>> </b></a>'
+		*pl 'Neuroboosters: <a href="exec:mc_inventory[''mentats'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''mentats'']>> </b></a>'
+		*pl 'Steroids: <a href="exec:mc_inventory[''steroids'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''steroids'']>> </b></a>'
+		*pl 'Breast cream: <a href="exec:mc_inventory[''breastcream'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''breastcream'']>> </b></a>'
+		*pl 'Aphrodisiacs: <a href="exec:mc_inventory[''aphrodisiac'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''aphrodisiac'']>> </b></a>'
 	end
 	'<h4>Sex shop items</h4>'
 	if showSexItems = 0:

locations/FedorMisc.qsrc

@@ -513,8 +513,7 @@ if $ARGS[0] = 'Smoke':
 	*clr & cla
 	menu_off = 1
 	npc_rel['A5'] += 5
-	mc_inventory['cigarettes'] += 1
-	gs 'drugs', 'smoke'
+	gs 'drugs', 'smoke', 1
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 0
@@ -531,13 +530,8 @@ if $ARGS[0] = 'Smoke 2':
 	*clr & cla
 	menu_off = 1
 	npc_rel['A5'] += 5
-	mc_inventory['cigarettes'] += 1
-	gs 'drugs', 'smoke'
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
-	pcs_mood += 100
-	gs 'stat'
+	gs 'drugs', 'smoke', 1
+
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/Hall/smoke.jpg"></center>'
 	'"Sure thing." Fedor hands you a cigarette then puts one in his mouth as he collects his lighter from his pocket then lights both cigarettes. You both spend the next few minute gossiping about your classmates.'
@@ -644,7 +638,7 @@ if $ARGS[0] = 'Strength':
 	*clr & cla
 	menu_off = 1
 	minut += 30
-	gs 'exp_gain', 'stren', rand(1, 4) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	gs 'exp_gain', 'stren', rand(1, 4) + rand(0, drugVars['steroids_dose']) & gs 'obj_din', 'steroids'
 	fat -= 1
 	pcs_mood += 5
 	gs 'sweat', 'add', 30

locations/JuliaMilHome.qsrc

@@ -370,7 +370,7 @@ if $ARGS[0] = 'julia_room':
 			juliaQW['homework_day'] = daystart
 			gs 'npc_relationship', 'modify', 'A12', 'love' 
 			lern += rand(3,6)
-			gs 'exp_gain', 'intel', rand(1,2) + (mentats_dose - rand(0,mentats_dose))
+			gs 'exp_gain', 'intel', rand(1,2) + rand(0, drugVars['mentats_dose'])
 			gs 'stat'
 
 			*clr & cla

locations/KatjaHomeTalk.qsrc

@@ -779,7 +779,7 @@ if $ARGS[0] = 'homework':
 	npc_rel['A14'] += 2
 	gs 'grades', 'homework', 'school', 'yes', 1, 1, 'A14'
 	lern += rand(2, 4)
-	gs 'exp_gain', 'intel', rand(0, 1) + (mentats_dose - rand(0,mentats_dose))
+	gs 'exp_gain', 'intel', rand(0, 1) + rand(0, drugVars['mentats_dose'])
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'For half an hour you and Katja pour over your books, you fully learn the lessons and pretty well understand the material.'

locations/Komp.qsrc

@@ -549,7 +549,7 @@ if $ARGS[0] = 'study':
 	minut += 30
 	elektro += 3
 	gs 'internet_mobile', 'use_internet', $subs, 30
-	gs 'exp_gain', 'intel', 1 + (mentats_dose - rand(0,mentats_dose))
+	gs 'exp_gain', 'intel', 1 + rand(0, drugVars['mentats_dose'])
 	gs 'exp_gain', 'compskl', 1
 	'<center><b>The Institute for Education Measurement</b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/study.jpg"></center>'

locations/Vika.qsrc

@@ -178,7 +178,7 @@ end
 
 if $ARGS[0] = 'study':
 	minut += 60
-	gs 'exp_gain', 'intel', 1 + (mentats_dose - rand(0,mentats_dose))
+	gs 'exp_gain', 'intel', 1 + rand(0, drugVars['mentats_dose'])
 	gs 'npc_relationship', 'modify', 'A220', 'like'
 	gs 'stat'
 

locations/abduction.qsrc

@@ -651,8 +651,7 @@ if $ARGS[0] = 'abdFood':
 		if pain['total'] > 0 and pain['killer'] = 0:
 			act 'Take a painkiller':
 				cla
-				pain['killer'] += 1
-				mc_inventory['painkillers'] -= 1
+				gs 'drugs', 'painkiller'
 				if pcs_hydra >= 100:
 					pcs_hydra += 25
 				else

locations/albinahome.qsrc

@@ -170,8 +170,7 @@ if $ARGS[0] = 'bathroom':
 		if pain['total'] > 0 and pain['killer'] = 0:
 			act 'Take a painkiller':
 				cla
-				pain['killer'] += 1
-				mc_inventory['painkillers'] -= 1
+				gs 'drugs', 'painkiller'
 				pcs_hydra += 20
 				gs 'stat'
 				*nl

locations/anush_bedroom.qsrc

@@ -341,7 +341,6 @@ if $ARGS[0] = 'night_stand':
 		act 'Joint':
 			*clr & cla
 			minut += 2
-			joint += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/take_joint.jpg"></center>'
 			'You pull out one of the joints and hold it up. "Yeah, I like this..."'
@@ -350,9 +349,8 @@ if $ARGS[0] = 'night_stand':
 			'She flips you off for your snarky comeback. "Fuck you, bitch. Here, hand it over." You hand over the joint as she takes a lighter off the nightstand and lights it up, taking a long slow drag off it before handing it back to you.'
 			act 'Take a drag':
 				*clr & cla
-				minut += 20
-				gs 'drugs', 'joint'
-				gs 'stat'
+				minut += 30
+				gs 'drugs', 'joint', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/get_high.jpg"></center>'
 				'You take the joint from her and take a hit off it as you sit on the bed next to her. The two of you discuss various topics as you hand the joint back and forth, taking turns taking hits. Before too long, the joint is gone, and you feel pretty high.'
 				act 'Chill out': AnushkaLoc = 2 & gt 'anushkachat', 'chat'
@@ -369,7 +367,7 @@ if $ARGS[0] = 'night_stand':
 		act 'Take joint':
 			*clr & cla
 			minut += 2
-			joint += 1
+			mc_inventory['joints'] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/take_joint.jpg"></center>'
 			'You decide to take one of the joints. Surely she won''t mind that you took just one? You take it out and look at it before placing it in your purse for later and closing the drawer.'

locations/anush_bedroom_city.qsrc

@@ -240,7 +240,6 @@ if $ARGS[0] = 'night_stand':
 		act 'Joint':
 			*clr & cla
 			minut += 2
-			joint += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/take_joint.jpg"></center>'
 			'You pull out one of the joints and hold it up. "Yeah, I like this..."'
@@ -249,9 +248,8 @@ if $ARGS[0] = 'night_stand':
 			'She flips you off for your snarky comeback. "Fuck you, bitch. Here, hand it over." You hand over the joint as she takes a lighter off the nightstand and lights it up, taking a long slow drag off it before handing it back to you.'
 			act 'Take a drag':
 				*clr & cla
-				minut += 20
-				gs 'drugs', 'joint'
-				gs 'stat'
+				minut += 30
+				gs 'drugs', 'joint', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/get_high.jpg"></center>'
 				'You take the joint from her and take a hit off it as you sit on the bed next to her. The two of you discuss various topics as you hand the joint back and forth, taking turns taking hits. Before too long, the joint is gone, and you feel pretty high.'
 				act 'Chill out': locat['A144'] = 2 & gt 'anushkachat_city', 'chat'
@@ -268,7 +266,7 @@ if $ARGS[0] = 'night_stand':
 		act 'Take joint':
 			*clr & cla
 			minut += 2
-			joint += 1
+			mc_inventory['joints'] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/take_joint.jpg"></center>'
 			'You decide to take one of the joints. Surely she won''t mind that you took just one? You take it out and look at it before placing it in your purse for later and closing the drawer.'

locations/anushka.qsrc

@@ -117,14 +117,12 @@ if $ARGS[0] = 'plan':
 				npc_rel['A144'] += 1
 				npc_rel['A158'] += 1
 				grupvalue[4] += 1
-				minut += 3
+				minut += 13
 				gs 'drugs', 'alcohol',  'moonshine', 1
-				gs 'drugs', 'joint'
-				gs 'stat'
+				gs 'drugs', 'joint', 1
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/detcbj.jpg"></center>'
 				'You take the offered drink and take a swig as well. You immediately regret it because you choke and cough from the burning liquid. This results in them both laughing. Whatever is in the flask is much stronger than you expected. Anushka soon takes out a joint and lights it up before passing it around. After only a few drinks each, the flask is empty, and the joint doesn''t last much longer. With the flask empty and the joint smoked to ashes, you''re feeling pretty buzzed and watch in dazed fascination as Valentin pulls his pants down.'
-				gs 'stat'
 				if hotcat >= 6:
 					'As Anushka and Valentin make out, she reaches down to close her hand around his cock and immediately starts to jerk him. After she has him good and hard, she reaches toward you with both hands to grab your head and push you down into his lap.'			
 					gs 'willpower', 'bj', 'resist'
@@ -659,7 +657,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 					end
 					if artemQW['bf'] = 1:
 						act 'Artem':
-							cla					
+							cla
 							'"Artem," you tell her.'
 							'She arches a slender brow slightly. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute, and I bet you have him totally pussy whipped to do whatever you want. Yeah ok, I can see the appeal." she says with a giggle.'
 							'You shake your head at her comment. "He''s sweet and really nice to me."'

locations/anushkaev2.qsrc

@@ -1270,9 +1270,8 @@ if $ARGS[0] = 'disco_emptyroom':
 	'You find an unlocked door and tell her to go inside. "Head in, I''ll join you in a minute." You quickly walk to the womens restroom, enter one of the stalls and slide the strap-on harness on under your skirt so the dildo hangs between your legs. The strap-on in place, you head back to the room where you left Anushka. When you enter, you look around, unsure what the purpose of the room is before locking the door. Anushka is standing in a corner smoking a joint as you walk over and lean against the wall. She looks you over with a hungry lust filled look in her eye and offers you a hit of the joint.'
 	act 'Take a hit':
 		cla
-		joint += 1
-		minut += 5
-		gs 'drugs', 'joint'
+		minut += 15
+		gs 'drugs', 'joint', 1
 		*nl
 		'You take the offered joint from her and take a hit of it before handing it back. You spend several minutes passing the joint back and forth until it''s gone. Feeling nice and high, it''s time to show her what you''re already wearing.'
 		act 'Show her the strapon':

locations/balkon.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'start':
 	act 'Approach the railing':gt 'balkon2', 'niz'
 	
 	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 mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt 'balkon', 'start'
 	if pcs_horny >= 50 and pcs_inhib > 30: act 'Masturbate':gt 'balkon2', 'masopt'	
 end
 

locations/bass.qsrc

@@ -111,7 +111,7 @@ if $ARGS[0] = 'a':
 			if pcs_sweat > 15 : pcs_sweat = 10 + rand(0,4)
 			pcs_mood += 5
 
-			if pcs_stren < 40:gs 'exp_gain', 'stren', 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			if pcs_stren < 40:gs 'exp_gain', 'stren', 1 + rand(0, drugVars['steroids_dose']) & gs 'obj_din', 'steroids'		& ! obj_din does not have a steroids sublocation??
 			if KisameSex = 0:KisameSex = 1 & Set guy += 1
 			gs 'boyStat', 'A40'
 			'<center><img <<$set_imgh>> src="images/characters/city/kisame/sex/kisamebj.jpg"></center>'

locations/body.qsrc

@@ -472,26 +472,8 @@ if $ARGS[0] = 'Update_daily_body_other':
 		end
 	end
 
-	if bcream_used >= 1:
-		bcream_used = 0
-
-		temp = pcs_mass['bust'] - pcs_mass['bust_gen']
-		temp = rand(0, 5 + max(0, temp)) / max(1, temp)
-
-		if temp > 0:
-			bodyVars['bust_other'] += 1
-			'Feels like your breasts have grown slightly.'
-		end
-		killvar 'temp'
-	end
-	
-	if steroid_dose >= 1:
-		if lashair < 1:
-			pcs_pubes += steroid_dose
-			pcs_leghair += steroid_dose
-		end
-		steroid_dose = 0
-	end
+	gs 'drugs', 'breastcream', 'cikl'
+	gs 'drugs', 'steroids', 'cikl'
 end
 
 

locations/brothel.qsrc

@@ -35,15 +35,15 @@ $rec_font = '585858'
 
 dbg = 0
 if dbg = 1:
-	'loc: '+$loc
-	'args: '+$ARGS[0]
-	'session: '+$sessionB
-	'stage: '+stage
-	'pain: '+pain['total']
-	'step: '+step
-	'bonus '+bonus
-	'custTime '+custTime
-	'caneFeetCount '+caneFeetCount
+	'loc: ' + $loc
+	'args: ' + $ARGS[0]
+	'session: ' + $sessionB
+	'stage: ' + stage
+	'pain: ' + pain['total']
+	'step: ' + step
+	'bonus: ' + bonus
+	'custTime: ' + custTime
+	'caneFeetCount: ' + caneFeetCount
 end
 
 if orgasmMeter > 100: orgasmMeter = 100
@@ -605,8 +605,7 @@ if $ARGS[0] = 'brothel_dressingroom':
 	if mc_inventory['razor'] > 0: dynamic $brit
 	if mc_inventory['painkillers'] > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':
-			pain['killer'] += 1
-			mc_inventory['painkillers'] -= 1
+			gs 'drugs', 'painkiller'
 			pcs_hydra += 20
 			gt 'brothel', 'brothel_dressingroom', $ARGS[1]
 		end
@@ -2316,7 +2315,7 @@ if $ARGS[0] = 'section2_lobby':
 	'The section 2 lobby. This lobby is quite small, offering only enough room for a couch and a small table.'
 	'Only a single room is attached to the lobby by a wide door.Judging by the state of the floor, a lot of heavy equipment is regularly dragged in and out.'
 	'One of the doors also leads to a <a href="exec:gt ''brothel'', ''brothel_dressingroom'',''2''">room</a> made for the girls. '
-	if (klismaday = daystart and pcs_leghair <= 3 and pcs_pubes <= 3 and pcs_hairbsh = 1 and pcs_makeup > 2 and pcs_lipbalm >= 1 and $pantyworntype = 'none' and $clothingworntype = 'nude' and (cumloc[1] = 0 and cumloc[4] = 0 and cumloc[8] = 0 and cumloc[9] = 0 and cumloc[10] = 0 and cumloc[11] = 0 and cumloc[15] = 0 and cumloc[16] = 0 and cumloc[17] = 0) and pcs_sweat < 40 and alko < 3 and StrongNarkota = 0 or jointhigh = 0):
+	if (klismaday = daystart and pcs_leghair <= 3 and pcs_pubes <= 3 and pcs_hairbsh = 1 and pcs_makeup > 2 and pcs_lipbalm >= 1 and $pantyworntype = 'none' and $clothingworntype = 'nude' and (cumloc[1] = 0 and cumloc[4] = 0 and cumloc[8] = 0 and cumloc[9] = 0 and cumloc[10] = 0 and cumloc[11] = 0 and cumloc[15] = 0 and cumloc[16] = 0 and cumloc[17] = 0) and pcs_sweat < 40 and alko < 3 and drugVars['heroin_high'] = 0 or drugVars['weed_high'] = 0):
 		!!stage = 1
 		!!act 'Party with a client': gt 'brothel', 'section2_party'
 		!!act 'Have a bender': gt 'brothel', 'section2_bender'
@@ -2333,7 +2332,7 @@ if $ARGS[0] = 'section2_lobby':
 		if $pantyworntype ! 'none': '- remove your panties.'
 		if $clothingworntype ! 'nude': '- strip off your clothes.'
 		if alko > 3: '- be not drunk'
-		if StrongNarkota > 0 or jointhigh > 0: '- be sober'
+		if drugVars['heroin_high'] > 0 or drugVars['weed_high'] > 0: '- be sober'
 	end
 	act 'Go to the girl''s room':gt 'brothel', 'brothel_dressingroom', '2'
 	act 'Go to the reception': gt 'brothel', 'reception'

locations/cikl.qsrc

@@ -560,14 +560,6 @@ gs 'traits', 'overnight'
 !! Clothing wear and tear
 gs 'starenie'
 
-!!cocaine reduction
-if nark > 60:
-	nark = 60
-elseif nark > 30:
-	nark -= 3
-elseif nark > 0:
-	nark -= 1
-end
 
 if pregchem > 240:fat += 1
 
@@ -1023,16 +1015,10 @@ mosal_time = totminut
 !!also, the first thing you do in the morning is visiting your porcelain friend, no?
 killvar 'last_pee'
 
-if aphrodisiac_overdose = 1: aphrodisiac_overdose = 0
-if aphrodisiac_timer ! 0: aphrodisiac_timer	= 0
-
-if mentats_dose = 1:
-	mentats_dose = 0
-elseif mentats_dose > 1:
-	pain['head'] += 20 * mentats_dose
-	mentats_dose = 0
-end
-
+!!Drugs reduction
+gs 'drugs', 'cocaine', 'cikl'
+gs 'drugs', 'mentats', 'cikl'
+gs 'drugs', 'aphrodisiac', 'cikl'
 
 gs 'gaddvor','cikl'
 

locations/city_bobka.qsrc

@@ -147,14 +147,11 @@ end
 if $ARGS[0] = 'inject':
 	cls
 	minut += 5
-	StrongNarkota += 25
-	SNarkTimes += 1
-	NarkShmaraTimes += 1
-	pcs_mood += 40
-	gs 'stat'
+	drugVars['heroin_whore'] += 1
+	gs 'drugs', 'heroin'
 	$tempval = ''
 
-	if narkoman ! 0:$tempval = ' with trembling hands'
+	if drugVars['cocaine_addict'] ! 0:$tempval = ' with trembling hands'
 
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/crackwhore.jpg"></center>'
 	'You grab the syringe desperately and inject yourself<<$tempval>>. Meanwhile Bobka is looking down at you haughtily, shaking his head while laughing softly. "Another happy customer. Just like you''re going to make a lot of customers happy one day..."'
@@ -240,7 +237,7 @@ if $ARGS[0] = 'peeface':
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peeface.jpg"></center>'
 	'Bobka releases his flaccid penis from his trousers, and unleashes a warm stream of urine almost immediately. When you wince and close your eyes, he shouts angrily: "Don''t turn away! Open your eyes and look at me, slut! Right now!"'
 
-	act 'Look into his eyes':gt 'city_bobka', 'peeface2'
+	act 'Look into his eyes': gt 'city_bobka', 'peeface2'
 end
 
 if $ARGS[0] = 'peeface2':
@@ -252,7 +249,7 @@ if $ARGS[0] = 'peeface2':
 	'You open your eyes and look at him obediently, keeping your face so the urine at least won''t splash up your nose. His urine smells horribly and slowly drips down your body, forming a puddle underneath you. Your mind is going through a desperate struggle as you sit there; on the one hand you feel terrible for demeaning yourself so much, but on the other hand you''re happily anticipating your next high.'
 	'When you wipe your eyes clear with the back of your trembling hands, Bobka smiles meanly.'
 
-	act 'Ask for the dose':gt 'city_bobka', 'peeface3'
+	act 'Ask for the dose': gt 'city_bobka', 'peeface3'
 end
 
 if $ARGS[0] = 'peeface3':
@@ -264,7 +261,7 @@ if $ARGS[0] = 'peeface3':
 	'Bobka gets closer to you and shakes the last drops off his penis, and then wipes it on your hair.'
 	'"Did you like your shower? It seems just right, for the whore that you are..." he smiles serenely, seeing the defeated look in your eyes. He knows he''s very close to breaking you for good, and offers you the syringe without playing any games.'
 
-	act 'Grab the syringe':gt 'city_bobka', 'peewhore'
+	act 'Grab the syringe': gt 'city_bobka', 'peewhore'
 end
 
 if $ARGS[0] = 'peeswallow':
@@ -279,7 +276,7 @@ if $ARGS[0] = 'peeswallow':
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peeswallow.jpg"></center>'
 	'As soon as you open your mouth, a torrent of Bobka''s urine enters your mouth. You nearly choke and cough from the horrible taste, and grimace from the nasty smell that fills your nostrils.'
 
-	act 'Cough uncontrollably':gt 'city_bobka', 'peeswallow2'
+	act 'Cough uncontrollably': gt 'city_bobka', 'peeswallow2'
 end
 
 if $ARGS[0] = 'peeswallow2':
@@ -293,7 +290,7 @@ if $ARGS[0] = 'peeswallow2':
 	'"Swallow it, whore! Swallow it all, or you''re not getting anything!" Bobka barks loudly.'
 	'You throw your head back and open your mouth as far as you can, just letting the urine flow directly into your stomach without even bothering to swallow. Your stomach fills quickly, and you feel a bit bloated when the stream finally slows down.'
 
-	act 'Swallow the last drops':gt 'city_bobka', 'peeswallow3'
+	act 'Swallow the last drops': gt 'city_bobka', 'peeswallow3'
 end
 
 if $ARGS[0] = 'peeswallow3':
@@ -304,7 +301,7 @@ if $ARGS[0] = 'peeswallow3':
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peeswallow3.jpg"></center>'
 	'Bobka steps a bit closer to you and puts the tip of his cock directly onto your lower lip and then makes you close your mouth, making you suck the last drops out of him directly.'
 
-	act 'Lick his cock clean':gt 'city_bobka', 'peeswallow4'
+	act 'Lick his cock clean': gt 'city_bobka', 'peeswallow4'
 end
 
 if $ARGS[0] = 'peeswallow4':
@@ -318,26 +315,21 @@ if $ARGS[0] = 'peeswallow4':
 	'While you try not to think about what you just did to earn it, you extend your trembling hand.'
 	'Bobka laughs as he offers you a syringe and the 100 <b>₽</b> he promised you: "I think you may have found your calling! This might be a decent career for you... maybe I can make some arrangements. Anyway, here you go. I hope it was worth it."'
 
-	act 'Grab the syringe':gt 'city_bobka', 'peewhore'
+	act 'Grab the syringe': gt 'city_bobka', 'peewhore'
 end
 
 if $ARGS[0] = 'peewhore':
 	cla
 	cls
 	minut += 5
-	StrongNarkota += 25
-	SNarkTimes += 1
-	NarkShmaraTimes += 1
-	pcs_mood += 40
 	pcs_hydra += 20
-	gs 'stat'
+	drugVars['heroin_whore'] += 1
+	gs 'drugs', 'heroin'
+
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peewhore.jpg"></center>'
 	'You don''t even bother washing yourself as you quickly grab the syringe, and inject yourself with it. Bobka looks down on you with a devious smile, he knows he''s very close to completely controlling your life. Soon, you won''t be able to say no any more...'
 
-	act 'Leave the drug den':
-		minut += 5
-		gt 'city_residential'
-	end
+	act 'Leave the drug den': minut += 5 & gt 'city_residential'
 end
 
 --- city_bobka ---------------------------------

locations/city_church.qsrc

@@ -201,14 +201,14 @@ if $ARGS[0] = 'pray':
 			pcs_mood += 50
 			church_moral += 1
 			minut += rand(30,60)
-			if nark > 1: nark = nark/2
+			if drugVars['cocaine_system'] > 1: drugVars['cocaine_system'] = drugVars['cocaine_system'] / 2
 			'The Nave is lit only with small candles, leaving your surroundings in darkness, but you find it comforting. You get the urge to pray very intensely and before you know it, an hour has passed and you feel cleansed.'
 		else
 			pcs_horny = 0
 			pcs_mood = 100
 			church_moral += 1
 			minut += 60
-			if nark > 1: nark = ((nark/4)*3)
+			if drugVars['cocaine_system'] > 1: drugVars['cocaine_system'] = 3 * drugVars['cocaine_system'] / 4
 			'The Nave is lit only with candles and small presence lights and the darkness feels very comforting, like being in the womb. You get the urge to pray very intensely and before you know it, more than an hour has passed and you feel reborn and cleansed.'
 		end
 		gs 'stat'

locations/city_drugden.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 		act 'Ask for amphetamine': gt 'city_drugden', 'amphetamine'
 		act 'Ask for weed': gt 'city_drugden', 'joints'
 		act 'Ask for cocaine': gt 'city_drugden', 'cocaine'
-		if mid($start_type,1,2) = 'sg' and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
+		if mid($start_type,1,2) = 'sg' and drugVars['pav_dropoff'] = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'ask_pav_drug_dropoff'
 	elseif drugUser = 0:
 		'"Ahhh, what do you have?" you ask.'
 		'His eyes light up at a freshy and smiles wildy, "Well I have some H and amphetamine."'
@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 		act 'Ask for amphetamine': gt 'city_drugden', 'amphetamine'
 		act 'Ask for weed': gt 'city_drugden', 'joints'
 		act 'Ask for cocaine': gt 'city_drugden', 'cocaine'
-	elseif (StrongNarkota > 23 and amphHigh > 23) or amphHigh > 23 or StrongNarkota > 23:
+	elseif drugVars['amphetamine_high'] > 23 or drugVars['heroin_high'] > 23:
 		gt 'city_drugden', 'kiteHigh'
 	end
 end
@@ -45,13 +45,13 @@ if $ARGS[0] = 'amphetamine':
 	'<center><b>Local drug den</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'"That''ll be 80 <b>₽</b> per pill," he says.'
-	'You have <<amphetamine>> pills.'
+	'You have <<mc_inventory[''amphetamine'']>> pills.'
 	act 'Leave the drug den': minut += 5 & gt 'city_residential'
 	if money >= 1600:
 		act 'Buy 20 (1,600 <b>₽</b>)':
 			money -= 1600
 			drugUser = 1
-			amphetamine += 20
+			mc_inventory['amphetamine'] += 20
 			minut += 5
 			gt 'city_drugden', 'amphetamine'
 		end
@@ -60,7 +60,7 @@ if $ARGS[0] = 'amphetamine':
 		act 'Buy 10 (800 <b>₽</b>)':
 			money -= 800
 			drugUser = 1
-			amphetamine += 10
+			mc_inventory['amphetamine'] += 10
 			minut += 5
 			gt 'city_drugden', 'amphetamine'
 		end
@@ -69,7 +69,7 @@ if $ARGS[0] = 'amphetamine':
 		act 'Buy 5 (400 <b>₽</b>)':
 			money -= 400
 			drugUser = 1
-			amphetamine += 5
+			mc_inventory['amphetamine'] += 5
 			minut += 5
 			gt 'city_drugden', 'amphetamine'
 		end
@@ -85,13 +85,13 @@ if $ARGS[0] = 'joints':
 	'<center><b>Local drug den</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'"That''ll be 250 <b>₽</b> for enough weed to make five joints," he says.'
-	'You have enough weed for <<joint>> joints.'
+	'You have enough weed for <<mc_inventory[''joints'']>> joints.'
 	act 'Leave the drug den': minut += 5 & gt 'city_residential'
 	if money >= 1000:
 		act 'Buy enough weed for 20 joints (1,000 <b>₽</b>)':
 			money -= 1000
 			drugUser = 1
-			joint += 20
+			mc_inventory['joints'] += 20
 			minut += 5
 			gt 'city_drugden', 'joints'
 		end
@@ -100,7 +100,7 @@ if $ARGS[0] = 'joints':
 		act 'Buy enough weed for 10 joints  (500 <b>₽</b>)':
 			money -= 500
 			drugUser = 1
-			joint += 10
+			mc_inventory['joints'] += 10
 			minut += 5
 			gt 'city_drugden', 'joints'
 		end
@@ -109,7 +109,7 @@ if $ARGS[0] = 'joints':
 		act 'Buy enough weed for 5 joints  (250 <b>₽</b>)':
 			money -= 250
 			drugUser = 1
-			joint += 5
+			mc_inventory['joints'] += 5
 			minut += 5
 			gt 'city_drugden', 'joints'
 		end
@@ -125,13 +125,13 @@ if $ARGS[0] = 'cocaine':
 	'<center><b>Local drug den</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'"That''ll be 360 <b>₽</b> for enough cocaine to get you high once," he says.'
-	'You have enough cocaine for <<dur>> lines.'
+	'You have enough cocaine for <<mc_inventory[''cocaine'']>> lines.'
 	act 'Leave the drug den': minut += 5 & gt 'city_residential'
 	if money >= 7200:
 		act 'Buy enough cocaine for 20 lines (7,200 <b>₽</b>)':
 			money -= 7200
 			drugUser = 1
-			dur += 20
+			mc_inventory['cocaine'] += 20
 			minut += 5
 			gt 'city_drugden', 'cocaine'
 		end
@@ -140,7 +140,7 @@ if $ARGS[0] = 'cocaine':
 		act 'Buy enough cocaine for 10 highs (3,600 <b>₽</b>)':
 			money -= 3600
 			drugUser = 1
-			dur += 10
+			mc_inventory['cocaine'] += 10
 			minut += 5
 			gt 'city_drugden', 'cocaine'
 		end
@@ -149,7 +149,7 @@ if $ARGS[0] = 'cocaine':
 		act 'Buy enough cocaine for 5 highs (1,800 <b>₽</b>)':
 			money -= 1800
 			drugUser = 1
-			dur += 5
+			mc_inventory['cocaine'] += 5
 			minut += 5
 			gt 'city_drugden', 'cocaine'
 		end
@@ -169,7 +169,7 @@ if $ARGS[0] = 'heroin':
 	if money >= 420:
 		act 'Buy heroin and smoke it (420 <b>₽</b>)':
 			money -= 420
-			if SNarkTimes <= 10:
+			if drugVars['heroin_used'] <= 10:
 				*clr & cla
 				minut += 20
 				gs 'stat'
@@ -208,7 +208,7 @@ if $ARGS[0] = 'heroin':
 					gs 'stat'
 					act 'You lay there briefly rolling, before leaving': gs 'events', 'snkayf1'
 				end
-			elseif SNarkTimes['inject'] < 1:
+			elseif drugVars['heroin_inject'] < 1:
 				*clr & cla
 				minut += 10
 				gs 'stat'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'heroin':
 					'"Thanks." You take the needle and go find a couch in the house to sit on.'
 					'You inject the needle into your arm unable to stop yourself from trembling a little.'
 					'The rush is instantaneous, you close your eyes as it rolls over you.'
-					SNarkTimes['inject'] = 1
+					drugVars['heroin_inject'] = 1
 					drugUser = 1
 					gs 'drugs', 'heroin'
 					gs 'stat'
@@ -266,7 +266,7 @@ if $ARGS[0] = 'heroin':
 				act 'Leave the drug den': minut += 5 & gt 'city_residential'
 			end
 		end
-	elseif money < 420 and SLomka > 0:
+	elseif money < 420 and drugVars['heroin_need'] > 0:
 		act 'Beg him to give you some':	gs 'city_drugden', 'drugslut'
 	end
 	act 'Buy some amphetamine instead':	gt 'city_drugden', 'amphetamine'
@@ -281,7 +281,7 @@ if $ARGS[0] = 'drugslut':
 	minut += 5
 	gs 'stat'
 
-	if NarkShmaraTimes > 0:
+	if drugVars['heroin_whore'] > 0:
 		'"Bobka, please! You remember me, right? I''m good for it, you can trust me!" you beg him, but he gives you a wicked grin.'
 		'"Come on, <<$pcs_nickname>>! You know I don''t do credit!" he snorts.'
 		
@@ -326,7 +326,7 @@ if $ARGS[0] = 'drugslut':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 				'You keep begging Bobka to give you some heroin, while you follow him to an empty room. He just laughs at you and says: <<$bobtalk>>'
 
-				act '<<$bobtext>>':	NarkShmaraTimes += 1 & gt 'city_bobka', bobrand
+				act '<<$bobtext>>':	drugVars['heroin_whore'] += 1 & gt 'city_bobka', bobrand
 				
 				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
@@ -343,7 +343,7 @@ if $ARGS[0] = 'drugslut':
 			end
 		end
 
-		if NarkShmaraTimes > 5:
+		if drugVars['heroin_whore'] > 5:
 			act 'Submit to your fate':
 				*clr & cla
 				over = 8
@@ -392,7 +392,7 @@ if $ARGS[0] = 'drugslut':
 				end
 			end
 		end
-	elseif NarkShmaraTimes = 0:
+	elseif drugVars['heroin_whore'] = 0:
 		'You beg the man: "Please! I need a hit... I need it badly! Please, I''ll pay you back! I promise!"'
 		'The guy laughs: "Yea, sure. Do you know how many times a day I hear that? If I had a ruble for every time someone told me that, I would''ve retired by now! I don''t do credit, simple as that. Get lost."'
 		
@@ -425,7 +425,7 @@ if $ARGS[0] = 'drugslut':
 				act 'Suck his cock':
 					*clr & cla
 					guy += 1
-					NarkShmaraTimes += 1
+					drugVars['heroin_whore'] += 1
 					gs 'cum_call', 'mouth_swallow', $boy, 1
 					gs 'dinSex', 'std_trigger'
 					'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/bj.jpg"></center>'

locations/city_kafe.qsrc

@@ -565,8 +565,10 @@ if $ARGS[0] = 'tips':
 	workKafe['tips_roll'] = 0
 	!! Skill and attribute gains
 	if pcs_servng < 100: gs 'exp_gain', 'servng', 1
-	if pcs_vital < 30: gs 'exp_gain', 'vital', 1 + rand(0,steroid_dose) & steroidcheck = 1
-	if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1) & killvar 'steroidcheck'
+	if pcs_vital < 30:
+		gs 'exp_gain', 'vital', 1 + rand(0, drugVars['steroids_dose'])
+		if drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1) & killvar 'steroidcheck'
+	end
 	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'

locations/city_library.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'read':
 	cla
 	act 'Read a book on science (1:00)':
 		dynamic $downlibrary['BookStudy'], ''
-		gs 'exp_gain', 'intel', rand(3,6) + (mentats_dose - rand(0,mentats_dose))
+		gs 'exp_gain', 'intel', rand(3,6) + rand(0, drugVars['mentats_dose'])
 		grupvalue[3] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/science1.jpg"></center>'

locations/city_mansion_residence_2.qsrc

@@ -156,7 +156,7 @@ if $ARGS[0] = 'ylibrary':
 		'A huge collection of books are neatly placed on the bookshelves.'
 		act 'Read a book on science (1:00)':
 			dynamic $downlibrary['read']
-			gs 'exp_gain', 'intel', rand(3,6) + (mentats_dose - rand(0,mentats_dose))
+			gs 'exp_gain', 'intel', rand(3,6) + rand(0, drugVars['mentats_dose'])
 			grupvalue[3] +=1
 			gs 'stat'
 

locations/city_park.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'start':
 	*nl
 	if hour >= 10 and hour <= 22:'The small café in the park is open. You could sit there and have some food.'
 
-	if SNarkPriton = 0:'Near the cafe, the <a href="exec: gt ''city_park'', ''junkies''">junkies</a> hang out.'
+	if drugVars['city_drugden'] = 0:'Near the cafe, the <a href="exec: gt ''city_park'', ''junkies''">junkies</a> hang out.'
 
 	if hour >= 9 or hour <= 20:
 		'There is an all year <a href="exec:gt ''city_park'', ''luna''">fair</a> at the park, which you can visit.'
@@ -94,7 +94,7 @@ if $ARGS[0] = 'start':
 
 	act 'Sit on a bench': gt'placer_sex','sitting_park_bench'
 	
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 
 	if pusher = 1 and hour >= 6 and hour <= 21:
 		'There''s a drug dealer casually sitting on one of the benches. He''s trying not to be too suspicious.'
@@ -104,15 +104,16 @@ if $ARGS[0] = 'start':
 				cla
 				menu_off = 1
 				minut += 10
-				palelady = input ("How many doses you want to buy?")
+				temp_doses = input ("How many doses you want to buy?")
 
-				if palelady * 360 > money or palelady <= 0:
+				if temp_doses * 360 > money or temp_doses <= 0:
 					'Either tell me how many you want to buy or get lost.'
 				else
-					money -= palelady * 360
-					dur += palelady
+					money -= temp_doses * 360
+					mc_inventory['cocaine'] += temp_doses
 					'You get out your purse and pay him quickly, hoping nobody else saw you giving him money. He passes you the doses you''ve paid for. You can safely sniff the stuff at home.'
 				end
+				killvar 'temp_doses'
 
 				act 'Casually walk away':gt 'city_park', 'start'
 			end
@@ -678,7 +679,7 @@ end
 if $ARGS[0] = 'junkies':
 	*clr & cla
 	gs 'stat'
-	SNarkPriton = 1
+	drugVars['city_drugden'] = 1
 	'The junkies look at you with an apprehensive gaze. They probably think you are a police officer. Then one of them says, "we don''t sell no drugs. Go to the Drug House, ye can get zome there."'
 
 	act 'Walk away from them':gt 'city_park', 'start'

locations/city_residential.qsrc

@@ -183,7 +183,7 @@ else
 	'You see several <a href="exec: minut += 1 & gt ''city_trashplace''">trash bins</a> in the courtyard of your <a href="exec: gt ''city_apt_building'',''floor_1''">apartment building</a>.'
 end
 
-if SNarkPriton > 0:'The <a href="exec:minut += 1 & gt ''city_drugden''">drug house</a> is clearly recognizable by the syringes and trash that lies in front of it.'
+if drugVars['city_drugden'] > 0:'The <a href="exec:minut += 1 & gt ''city_drugden''">drug house</a> is clearly recognizable by the syringes and trash that lies in front of it.'
 if hour >= 8 and hour <= 23 or saunaWorkWhore > 0 or workDisk = 2:'<a href="exec:minut += 10 & gt ''city_sauna''">The sauna</a> is a 10 minute walk away. Rumors say that it''s just a front for a brothel.'
 
 if hour >= 20 or hour <= 4:

locations/city_saunawhore.qsrc

@@ -51,16 +51,16 @@ if $ARGS[0] = 'saunawork':
 
 	act 'Use the staff bathroom': minut += 1 & gt 'city_saunawhore', 'bathroom'
 
-	if workDolg > 0 and (pcs_mood <= 10 or SLomka > 0):
+	if workDolg > 0 and (pcs_mood <= 10 or drugVars['heroin_need'] > 0):
 		cls
 		workDolg += 420
 		gs 'stat'
 		'You are beckoned by the nurse. You walk up to her and she demands to see your arm. You present your arm and she takes out a syringe filled with drugs. "Sit still, I''ll give you a shot now and it will make you feel like normal again."'
 
 		act 'Leave':
-			gs 'drugs', 'heroin'
 			minut += 10
-			gs 'stat'
+			gs 'drugs', 'heroin'
+
 			gt 'city_saunawhore', 'saunawork'
 		end
 		exit

locations/dimaEv.qsrc

@@ -77,8 +77,7 @@ end
 if $ARGS[0] = 'drugged':
 	*clr & cla
 	minut += 15
-	dur += 1
-	gs 'drugs', 'cocaine'
+	gs 'drugs', 'cocaine', 1
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
@@ -89,8 +88,7 @@ end
 if $ARGS[0] = 'cocaine':
 	*clr & cla
 	minut += 15
-	dur += 1
-	gs 'drugs', 'cocaine'
+	gs 'drugs', 'cocaine', 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 	'You sniff up the dose of powder. For a moment you just feel numb, then you feel yourself get aroused. The heat coming from your pussy intensifying as it soaks itself. You gasp. It is almost too much to take. You desperately need someone to fuck you. "Oh, fuck". You don''t think this is normal. He must have laced it with something. You blink a few times trying to clear your head, but soon your thoughts grow murky.'
@@ -367,8 +365,7 @@ if $ARGS[0] = 'dimkaplays':
 	act 'Snort':
 		*clr & cla
 		minut += 15
-		dur += 1
-		gs 'drugs', 'cocaine'
+		gs 'drugs', 'cocaine', 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 		'You sniff up the dose of powder. For a moment, you just feel numb, then you feel yourself get aroused, the heat coming from your pussy as it soaks itself, you gasp, it is almost too much to take, you desperately need someone to fuck you. "Oh, fuck". You don''t think this is normal, he must have laced it with something. You blink a few times trying to clear your head, but soon your thoughts grow murky'

locations/din_bad.qsrc

@@ -124,7 +124,7 @@ if $ARGS[0] = 'd_bag':
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	if mc_inventory['makeup_wipes'] > 0: 'You have <b><<mc_inventory[''makeup_wipes'']>></b> wet wipes left in your purse. <a href="exec:dynamic $d_salf">Use a tissue</a>'
 	if mc_inventory['painkillers'] > 0 and pain['total'] > 0 and pain['killer'] = 0: 
-		'You have <b><<mc_inventory[''painkillers'']>></b> painkiller'+iif(mc_inventory['painkillers'] > 1, 's ', ' ')+'left in your purse. <a href="exec: pain[''killer''] += 1 & mc_inventory[''painkillers''] -= 1 & gs ''din_bad'', ''d_bag''">Take One</a>'
+		'You have <b><<mc_inventory[''painkillers'']>></b> painkiller'+iif(mc_inventory['painkillers'] > 1, 's ', ' ')+'left in your purse. <a href="exec: gs ''drugs'', ''painkiller'' & gs ''din_bad'', ''d_bag''">Take One</a>'
 	elseif mc_inventory['painkillers'] > 0 and (pain['total'] = 0 or pain['killer'] > 0):
 		'You have <b><<mc_inventory[''painkillers'']>></b> painkiller'+iif(mc_inventory['painkillers'] > 1, 's ', ' ')+'left in your purse.'
 	end
@@ -198,8 +198,8 @@ if $ARGS[0] = 'd_bag':
 		if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0: act 'Manage your piercings': gt 'piercing_management', 'main'
 	end
 	*nl
-	if amphetamine > 0:	'You have <b><<amphetamine>></b> tablets of amphetamine left in your purse. <a href="exec: gs ''drugs'', ''amphetamine'' & gs ''din_bad'', ''d_bag''">Take One</a>'
-	if joint > 0: 'You have enough weed for <b><<joint>></b> joints.'
+	if mc_inventory['amphetamine'] > 0:	'You have <b><<mc_inventory[''amphetamine'']>></b> tablets of amphetamine left in your purse. <a href="exec: gs ''drugs'', ''amphetamine'' & gs ''din_bad'', ''d_bag''">Take One</a>'
+	if mc_inventory['joints'] > 0: 'You have enough weed for <b><<mc_inventory[''joints'']>></b> joints.'
 	if mc_inventory['contraceptive_pill'] > 0 and pillsleft[ptype] > 0:
 		'You have <b><<mc_inventory[''contraceptive_pill'']>></b> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <b><<pillsleft[ptype]>></b> pills left in your opened package.'
 	elseif mc_inventory['contraceptive_pill']	= 0 and pillsleft[ptype] > 0:
@@ -218,14 +218,14 @@ if $ARGS[0] = 'd_bag':
 	else
 		'You have no morning after pills.'
 	end
-	if mentats_have > 0 and mentats_dose < 3:
-		'<a href="exec: gs ''drugs'', ''mentats'' & gs ''din_bad'', ''d_bag'' & *pl ''<font color = green><br>You swallow the neurobooster pill.</font>''">Use a neurobooster pill in your purse.</a> There are <b><<mentats_have>></b> pills left. The warning label says not to take more than one per day.'
-	elseif mentats_have > 0:
-		'There are <b><<mentats_have>></b> neurobooster pills left. You really shouldn''t take any more pills today.'
+	if mc_inventory['mentats'] > 0 and drugVars['mentats_dose'] < 3:
+		'<a href="exec: gs ''drugs'', ''mentats'' & gs ''din_bad'', ''d_bag'' & *pl ''<font color = green><br>You swallow the neurobooster pill.</font>''">Use a neurobooster pill in your purse.</a> There are <b><<mc_inventory[''mentats'']>></b> pills left. The warning label says not to take more than one per day.'
+	elseif mc_inventory['mentats'] > 0:
+		'There are <b><<mc_inventory[''mentats'']>></b> neurobooster pills left. You really shouldn''t take any more pills today.'
 	end
-	if steroid_have > 0:'<a href="exec:dynamic $use_steroids & gs ''din_bad'', ''d_bag''">Use steroids.</a> You have <b><<steroid_have>></b> steroids left in your purse.'
-	if bcream_have > 0:'<a href="exec:dynamic $use_bcream & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<bcream_have>></b> cream left in your purse.'
-	if aphrodisiac_have > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $aphrodisiac_msg & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<aphrodisiac_have>></b> gum left in your purse.'
+	if mc_inventory['steroids'] > 0:'<a href="exec:dynamic gs ''drugs'', ''steroids'' & gs ''din_bad'', ''d_bag''">Use steroids.</a> You have <b><<mc_inventory[''steroids'']>></b> steroids left in your purse.'
+	if mc_inventory['breastcream'] > 0:'<a href="exec: gs ''drugs'', ''breastcream'' & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<mc_inventory[''breastcream'']>></b> cream left in your purse.'
+	if mc_inventory['aphrodisiac'] > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $drugVars[''aphrodisiac_msg''] & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<mc_inventory[''aphrodisiac'']>></b> gum left in your purse.'
 
 	if mc_inventory['refill_bottle'] = 4: 
 		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: mc_inventory[''refill_bottle''] = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
@@ -1057,26 +1057,6 @@ $d_pregmovement = {
 	end
 }
 
-$use_steroids = {
-	if steroid_dose < 3:
-		'<font color = blue>You swallow the orange pill.</font>'
-		steroid_dose += 1
-		steroid_counter += 1
-		steroid_have -= 1
-	else
-		'You really shouldn''t take any more pills today.'
-	end
-}
-
-$use_bcream = {
-	if bcream_used < 1:
-		'<font color = #DB7093>You smear the cream onto your breasts and rub it in.</font>'
-		bcream_used = 1
-		bcream_have -= 1
-	else
-		'Using any more cream won''t have any effect.'
-	end
-}
 
 if $ARGS[0] = 'takepill':
 	birth_control['using_bc'] = 3

locations/din_van.qsrc

@@ -1035,9 +1035,9 @@ $toymanage = {
 }
 
 $palelady = {
-	if dur > 0:'You have enough cocaine for <<dur>> '+iif(dur = 1, ' line.', ' lines.')
+	if mc_inventory['cocaine'] > 0:'You have enough cocaine for <<mc_inventory[''cocaine'']>> ' + iif(mc_inventory['cocaine'] = 1, ' line.', ' lines.')
 
-	if dur > 0 and narkday ! daystart:
+	if mc_inventory['cocaine'] > 0 and drugVars['cocaine_day'] ! daystart:
 		act 'Do a line of cocaine (0:05)':
 			*clr & cla
 			menu_off = 1
@@ -1124,8 +1124,7 @@ if $ARGS[0] = 'private':
 		if pain['total'] > 0 and pain['killer'] = 0:
 			act 'Take a painkiller':
 				cla
-				pain['killer'] += 1
-				mc_inventory['painkillers'] -= 1
+				gs 'drugs', 'painkiller'
 				pcs_hydra += 20
 				gs 'stat'
 
@@ -1137,8 +1136,8 @@ if $ARGS[0] = 'private':
 		end
 	end
 
-	if bcream_have > 0:
-		'<a href="exec:dynamic $use_bcream & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<bcream_have>>.'
+	if mc_inventory['breastcream'] > 0:
+		'<a href="exec:gs ''drugs'', ''breastcream'' & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
 	end
 
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:*clr & cla & dynamic $pirManage">Manage your piercings</a>'

locations/drugs.qsrc

@@ -1,13 +1,15 @@
 # drugs
 
 !! How to use:
-!! 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)
-!! Amphetamine: gs 'drugs', 'amphetamine' (if it isn''t svetas amphetamine, you have to add amphetamine += 1)
-!! Neurobooster: gs 'drugs', 'mentats' (if it isn''t svetas mentats, you have to add mentats_have += 1)
-!! Aphrodisiac: gs 'drugs', 'aphrodisiac' (if it isn''t svetas aphrodisiac, you have to add aphrodisiac_have += 1)
+!! Smoking:		gs 'drugs', 'smoke' (if it isn''t svetas cigarette, you have to use use  gs 'drugs', 'smoke', 1  OR add  mc_inventory['cigarettes'] += 1 or )
+!! Joint/Weed:	gs 'drugs', 'joint' (if it isn''t svetas joint, you have to use  gs 'drugs', 'joint', 1  OR add  mc_inventory['joints'] += 1)
+!! Heroin:		gs 'drugs', 'heroin'
+!! Cocaine:		gs 'drugs', 'cocaine' (if it isn''t svetas cocaine, you have to use  gs 'drugs', 'cocaine', 1  OR add  mc_inventory['cocaine'] += 1)
+!! Amphetamine:	gs 'drugs', 'amphetamine' (if it isn''t svetas amphetamine, you have to use  gs 'drugs', 'amphetamine', 1  OR add  mc_inventory['amphetamine'] += 1)
+!! Neurobooster:gs 'drugs', 'mentats' (if it isn''t svetas mentats, you have to  use  gs 'drugs', 'mentats', 1  OR add  mc_inventory['mentats'] += 1)
+!! Aphrodisiac:	gs 'drugs', 'aphrodisiac' (if it isn''t svetas aphrodisiac, you have to use  gs 'drugs', 'aphrodisiac', 1  OR add  mc_inventory['aphrodisiac'] += 1)
+!! Steroids:	gs 'drugs', 'steroids' (if it isn''t svetas steroids, you have to use  gs 'drugs', 'steroids', 1  OR add  mc_inventory['steroids'] += 1)
+!! Breast Cream:gs 'drugs', 'breastcream' (if it isn''t svetas breast cream, you have to use  gs 'drugs', 'breastcream', 1  OR add mc_inventory['breastcream'] += 1)
 
 !! Alcohol: gs 'drugs', 'alcohol', 'type', count
 !! Types: beer, champagne, moonshine, rum, scotch, vodka, wine, whiskey
@@ -15,240 +17,563 @@
 !! Example 1: sveta drinks vodka gs 'drugs', 'alcohol', 'vodka' (or gs 'drugs', 'alcohol', 'vodka', 1)
 !! Example 2: sveta drinks 2 beer gs 'drugs', 'alcohol', 'beer', 2
 
-if $ARGS[0] = 'smoke':
-	if NarkImmune = 0: 
-		smoker += 1
-		if smoker > 20 and smoke_exp = 0: smoke_exp = 1
+
+if $ARGS[0] = 'cikl':
+	gs 'drugs', 'cocaine', 'cikl'
+	gs 'drugs', 'mentats', 'cikl'
+	gs 'drugs', 'aphrodisiac', 'cikl'
+
+elseif $ARGS[0] = 'hourly_events':
+	gs 'drugs', 'smoke', 'hourly_events'
+	gs 'drugs', 'joint', 'hourly_events'
+	gs 'drugs', 'heroin', 'hourly_events'
+	gs 'drugs', 'cocaine', 'hourly_events'
+	gs 'drugs', 'amphetamine', 'hourly_events'
+	gs 'drugs', 'aphrodisiac', 'hourly_events'
+
+elseif $ARGS[0] = 'stat':
+	gs 'drugs', 'heroin', 'stat'
+	gs 'drugs', 'alcohol', 'stat'
+	gs 'drugs', 'cocaine', 'stat'
+	gs 'drugs', 'amphetamine', 'stat'
+
+elseif $ARGS[0] = 'pain_relief':
+	if alko > 9:
+		pain['relief'] = 70
+	elseif alko > 6:
+		pain['relief'] = 40
+	elseif alko > 3:
+		pain['relief'] = 15
 	end
-	
-	stat['cigarettes_smoked'] += 1
-	smokeDay = daystart
-	smokeHour = hour
-	smokeminut = minut + 3
-	smokerNeed = 0
-	cumspclnt = 2
-	teeth['smoked'] += 1
-	gs 'cum_cleanup'
-	pcs_breath = 0
-	pcs_mood += 100
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
+
+	if drugVars['heroin_high'] > 0:
+		pain['relief'] = 90
+	elseif drugVars['cocaine_system'] > 0:
+		pain['relief'] = 60
+	elseif pain['killer'] > 12 and alko <= 9:
+		pain['relief'] = 50
 	end
-	if pcs_energy < 80: pcs_energy += 4
-	gs 'stat'
-	if siga_bum = 1:
-		siga_bum = 0
+
+
+elseif $ARGS[0] = 'smoke':
+	if $ARGS[1] = 'hourly_events':
+		if drugVars['cigarettes_used'] >= 20 and drugVars['cheat_immune'] = 0: drugVars['cigarettes_need'] += 1
+		if drugVars['cigarettes_need'] > 10 and InSleep = 0 and pcs_mood > 20 and drugVars['cheat_immune'] = 0: pcs_mood -= pcs_mood / 10
+
+		if drugVars['cigarettes_need'] > 300:
+			drugVars['cigarettes_need'] = 0
+			drugVars['cigarettes_used'] = 0
+		end
 	else
-		mc_inventory['cigarettes'] -= 1
-		if mc_inventory['cigarettes'] = 0:msg'That was your last cigarette.'
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['cigarettes'] -= 1
+			if mc_inventory['cigarettes'] <= 0: mc_inventory['cigarettes'] = 0 & msg 'That was your last cigarette.'
+		end
+
+		if drugVars['cheat_immune'] = 1:
+			drugVars['cigarettes_used'] += 1
+			if drugVars['cigarettes_used'] > 20 and drugVars['cigarettes_exp'] = 0: drugVars['cigarettes_exp'] = 1
+		end
+		
+		stat['cigarettes_smoked'] += 1
+		drugVars['cigarettes_day'] = daystart
+		drugVars['cigarettes_hour'] = hour
+		drugVars['cigarettes_minute'] = minut + 3
+		drugVars['cigarettes_need'] = 0
+		teeth['smoked'] += 1
+
+		pcs_breath = 0
+		pcs_mood += 100
+		if pcs_hydra >= 100:
+			pcs_hydra -= 5
+		else
+			pcs_hydra -= 10
+		end
+		if pcs_energy < 80: pcs_energy += 4
+
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		gs 'stat'
 	end
+
 	
 elseif $ARGS[0] = 'joint':
-	minut += 10
-	if NarkImmune = 0: 
-		joint_smoked += 1
-		if joint_smoked > 5 and joint_exp = 0: joint_exp = 1
-	end
-	joint -= 1
-	jointday = daystart
-	jointhour = hour
-	jointminut = minut + 2
-	if minut > 30:
-		jointhigh = 2
-	else
-		jointhigh = 1
-	end	
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
-	pcs_mood += 100
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
+	if $ARGS[1] = 'hourly_events':
+		if drugVars['weed_high'] > 0: drugVars['weed_high'] -= 1
 	else
-		pcs_hydra -= 10
-	end
-	if pcs_energy > 20: 
-		pcs_energy -= 20
-	else
-		pcs_energy = 0
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['joints'] -= 1
+			if mc_inventory['joints'] <= 0: mc_inventory['joints'] = 0 & msg 'That was your last joint.'
+		end
+
+		if drugVars['cheat_immune'] = 0:
+			drugVars['weed_used'] += 1
+			if drugVars['weed_used'] > 5 and drugVars['weed_exp'] = 0: drugVars['weed_exp'] = 1
+		end
+
+		if minut > 30:
+			drugVars['weed_high'] = 2
+		else
+			drugVars['weed_high'] = 1
+		end
+		drugVars['weed_day'] = daystart
+		drugVars['weed_hour'] = hour
+		drugVars['weed_minute'] = minut + 2
+
+		pcs_breath = 0
+		pcs_mood += 100
+		if pcs_hydra >= 100:
+			pcs_hydra -= 5
+		else
+			pcs_hydra -= 10
+		end
+		pcs_energy = max(0, pcs_energy - 20)
+
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		gs 'stat'
 	end
-	gs 'stat'
+
+
 elseif $ARGS[0] = 'heroin':
-	if NarkImmune = 0: 
-		SNarkTimes += 1
-		if SNarkTimes > 1 and heroin_exp = 0: heroin_exp = 1
+	if $ARGS[1] = 'hourly_events':
+		if drugVars['heroin_high'] > 0: 
+			pcs_mood -= (40 / drugVars['heroin_high'])
+			drugVars['heroin_high'] -= 1
+		end
+
+		if drugVars['heroin_need'] > 0 and pcs_mood > 10: 
+			drugVars['heroin_need'] += 1
+			pcs_mood -= pcs_mood / 10
+		end
+		if drugVars['heroin_need'] > 100 and drugVars['heroin_high'] <= 0: 
+			drugVars['heroin_need'] = 0
+			drugVars['heroin_used'] = 0
+		end
+	elseif $ARGS[1] = 'stat':
+		if drugVars['heroin_high'] >= 20 and alko > 0: alko = 0
+		if drugVars['heroin_high'] <= 0:
+			if drugVars['heroin_used'] >= 3 and drugVars['heroin_need'] = 0: drugVars['heroin_need'] = 1
+		else
+			if drugVars['heroin_need'] > 0: drugVars['heroin_need'] = 0
+			pcs_mood = 100
+		end
+		if drugVars['heroin_used'] >= drugVars['heroin_penalty'] * 25:
+			if drugVars['heroin_penalty'] > 0: vidage += 1
+			drugVars['heroin_penalty'] += 1
+		end
+	else
+		if drugVars['cheat_immune'] = 0:
+			drugVars['heroin_used'] += 1
+			if drugVars['heroin_used'] > 1 and drugVars['heroin_exp'] = 0: drugVars['heroin_exp'] = 1
+		end
+
+		drugVars['heroin_high'] += 25
+		drugVars['heroin_day'] = daystart
+
+		pcs_mood = 100
+		pcs_health -= 10
+		gs 'stat'
 	end
-	StrongNarkota += 25
-	narkozakday = daystart
-	pcs_mood = 100
-	pcs_health -= 10
-	gs 'stat'
+
+
 elseif $ARGS[0] = 'cocaine':
-	if NarkImmune = 0: 
-		cocaine_count += 1
-		if cocaine_count > 3 and cocaine_exp = 0: cocaine_exp = 1
+	if $ARGS[1] = 'cikl':
+		if drugVars['cocaine_system'] > 60:
+			drugVars['cocaine_system'] = 60
+		elseif drugVars['cocaine_system'] > 30:
+			drugVars['cocaine_system'] -= 3
+		elseif drugVars['cocaine_system'] > 0:
+			drugVars['cocaine_system'] -= 1
+		end
+	elseif $ARGS[1] = 'hourly_events':
+		if drugVars['cocaine_addict'] = 1 and drugVars['cocaine_day'] ! daystart:
+			pcs_health -= 5
+			
+			!! Changed from pcs_mood > 40 -> pcs_mood > 45 to avoid pcs_mood becoming lower than 5. Blame Anjuna
+			if pcs_mood > 45:
+				pcs_mood -= 40
+			else
+				pcs_mood = 5
+			end
+		end
+	elseif $ARGS[1] = 'stat':
+		if drugVars['cheat_immune'] = 1:
+			if drugVars['cocaine_addict'] ! 0: drugVars['cocaine_addict'] = 0
+		elseif drugVars['cocaine_system'] >= 30 and drugVars['cocaine_addict'] = 0 and drugVars['cheat_immune'] = 0:
+			drugVars['cocaine_addict'] = 1
+		elseif drugVars['cocaine_system'] = 0 and drugVars['cocaine_addict'] = 1:
+			drugVars['cocaine_addict'] = 0
+		end
+	else
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['cocaine'] -= 1
+			if mc_inventory['cocaine'] <= 0: mc_inventory['cocaine'] = 0 & msg 'That was your last line of cocaine.'
+		end
+		if drugVars['cheat_immune'] = 0:
+			drugVars['cocaine_used'] += 1
+			if drugVars['cocaine_used'] > 3 and drugVars['cocaine_exp'] = 0: drugVars['cocaine_exp'] = 1
+		end
+
+		drugVars['cocaine_system'] += 10
+		drugVars['cocaine_day'] = daystart
+		if drugVars['cocaine_willday'] ! daystart: drugVars['cocaine_willday'] = daystart & pcs_willpwr += 10
+
+		pcs_health = pcs_vital * 10 + pcs_stren * 5
+		pcs_mood = 100
+		pcs_horny = 100
+		gs 'stat'
 	end
-	narkday = daystart
-	dur -= 1
-	pcs_health = pcs_vital * 10 + pcs_stren * 5
-	if willday_cocaine ! daystart: willday_cocaine = daystart & pcs_willpwr += 10
-	pcs_mood = 100
-	pcs_horny = 100
-	nark += 10
-	gs 'stat'
+
+
 elseif $ARGS[0] = 'amphetamine':
-	if NarkImmune = 0: 
-		amphetamine_count += 1
-		if amphetamine_count > 5 and amphetamine_exp = 0: amphetamine_exp = 1
-	end
-	if amphIntake < 2:
-		'<font color= blue>You swallow the white pill.</font>'
-		amphIntake += 1
-		amphetamine -=1
-		amphHigh = 12
+	if $ARGS[1] = 'hourly_events':
+		if insleep = 1:
+			if drugVars['amphetamine_high'] > 0:
+				pcs_energy -= (4 / drugVars['amphetamine_bonus'])
+				pcs_hydra  -= (8 / drugVars['amphetamine_bonus'])
+			else
+				pcs_energy -= (4 * drugVars['amphetamine_bonus'])
+				pcs_hydra  -= (8 * drugVars['amphetamine_bonus'])
+			end
+		else
+			if drugVars['amphetamine_high'] > 0:
+				pcs_energy -= ( 8 / drugVars['amphetamine_bonus'])
+				pcs_hydra  -= (16 / drugVars['amphetamine_bonus'])
+			else
+				pcs_energy -= ( 8 * drugVars['amphetamine_bonus'])
+				pcs_hydra  -= (16 * drugVars['amphetamine_bonus'])
+			end
+		end
+
+		if drugVars['amphetamine_withdrawl'] >= 5: 
+			drugVars['amphetamine_withdrawl'] += 1
+			pcs_mood -= (drugVars['amphetamine_withdrawl'] / 5)
+		end
+
+		if drugVars['amphetamine_high'] > 0:
+			if drugVars['amphetamine_withdrawl'] < 2: drugVars['amphetamine_withdrawl'] = 2
+			drugVars['amphetamine_bonus'] = 3
+			drugVars['amphetamine_high'] -= 4
+			pcs_mood += (2 * drugVars['amphetamine_high'])
+
+		elseif drugVars['amphetamine_high'] <= 0 and drugVars['amphetamine_withdrawl'] = 2:
+			if drugVars['amphetamine_intake'] > 0:
+				drugVars['amphetamine_intake'] -= 1
+			else
+				drugVars['amphetamine_withdrawl'] = 0
+			end
+
+			drugVars['amphetamine_high'] = 0
+			drugVars['amphetamine_bonus'] = 2
+			pcs_mood -= pcs_mood / 10
+
+		elseif drugVars['amphetamine_intake'] > 0:
+			drugVars['amphetamine_withdrawl'] += 1
+
+		elseif drugVars['amphetamine_high'] = 0 and drugVars['amphetamine_withdrawl'] = 0:
+			drugVars['amphetamine_bonus'] = 1
+		end
+
+		if drugVars['amphetamine_withdrawl'] > 169: 
+			drugVars['amphetamine_withdrawl'] = 1
+			drugVars['amphetamine_bonus'] = 1
+			drugVars['amphetamine_used'] = 0
+		end
+
+	elseif $ARGS[1] = 'stat':
+		if drugVars['amphetamine_used'] > 3 and drugVars['amphetamine_high'] <= 0:
+			temp_addictChance = rand(1,10)
+			if temp_addictChance > 8:
+				drugVars['amphetamine_withdrawl'] = 2
+			end
+			killvar 'temp_addictChance'
+		end
 	else
-		'Your heart is already beating uncontrollably in your chest, you should avoid taking anymore pills.'
+		if drugVars['amphetamine_intake'] >= 2:
+			'Your heart is already beating uncontrollably in your chest, you should avoid taking anymore pills.'
+		else
+			'<font color= blue>You swallow the white pill.</font>'
+
+			if ARGS[1] = 0 and $ARGS[1] = '':
+				mc_inventory['amphetamine'] -= 1
+				if mc_inventory['amphetamine'] <= 0: mc_inventory['amphetamine'] = 0 & msg 'That was your last amphetamine pill.'
+			end
+			if drugVars['cheat_immune'] = 0: 
+				drugVars['amphetamine_used'] += 1
+				if drugVars['amphetamine_used'] > 5 and drugVars['amphetamine_exp'] = 0: drugVars['amphetamine_exp'] = 1
+			end
+
+			drugVars['amphetamine_intake'] += 1
+			drugVars['amphetamine_high'] = 12
+		end
+		gs 'stat'
 	end
-	gs 'stat'
-elseif $ARGS[0] = 'alcohol':
-	if NarkImmune = 0: 
-		alcohol_count += 1
-		if alcohol_count > 15 and alcohol_exp = 0: alcohol_exp = 1
-	end	
-	if ARGS[2] <= 1: 
-		alc_count = 1
+
+
+elseif $ARGS[0] = 'mentats':
+	if $ARGS[1] = 'cikl':
+		if drugVars['mentats_dose'] = 1:
+			drugVars['mentats_dose'] = 0
+		elseif drugVars['mentats_dose'] > 1:
+			pain['head'] += 20 * drugVars['mentats_dose']
+			drugVars['mentats_dose'] = 0
+		end
 	else
-		alc_count = ARGS[2]
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['mentats'] -= 1
+			if mc_inventory['mentats'] <= 0: mc_inventory['mentats'] = 0 & msg 'That was your last neurobooster pill.'
+		end
+		drugVars['mentats_used'] += 1
+		drugVars['mentats_dose'] += 1
+		gs 'stat'
 	end
-	:alcohol_jump
-	alc_count -= 1
-	frost = 0
-	pcs_health -= 5
-	pcs_energy -= 5
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
-	if $ARGS[1] = 'beer':
-		if pcs_traits['alko_status'] = -1:
-			alko += rand(1,2)
-		elseif pcs_traits['alko_status'] = 1:
-			alko += rand(0,1)
-		else
-			alko += 1
+
+elseif $ARGS[0] = 'steroids':
+	if $ARGS[0] = 'cikl':
+		if drugVars['steroids_dose'] >= 1:
+			if lashair < 1:
+				pcs_pubes += drugVars['steroids_dose']
+				pcs_leghair += drugVars['steroids_dose']
+			end
+			drugVars['steroids_dose'] = 0
 		end
-		fat += 3
-		pcs_mood += 10
-		if pcs_hydra >= 100:
-			pcs_hydra += 5
-		else
-			pcs_hydra += 10
-		end
-		pcs_traits['alko_day'] += 1
-	elseif $ARGS[1] = 'wine' or $ARGS[1] = 'champagne':
-		if pcs_traits['alko_status'] = -1:
-			alko += 3
-		elseif pcs_traits['alko_status'] = 1:
-			alko += 1
+	else
+		if drugVars['steroids_dose'] < 3:
+			'<font color = blue>You swallow the orange pill.</font>'
+
+			if ARGS[1] = 0 and $ARGS[1] = '':
+				mc_inventory['steroids'] -= 1
+				if mc_inventory['steroids'] <= 0: mc_inventory['steroids'] = 0 & msg 'That was your last steroid pill.'
+			end
+
+			drugVars['steroids_used'] += 1
+			drugVars['steroids_dose'] += 1
 		else
-			alko += 2
+			'You really shouldn''t take any more pills today.'
 		end
-		fat += 4
-		pcs_mood += 20
-		if pcs_hydra >= 100:
-			pcs_hydra += 5
-		else
-			pcs_hydra += 10
-		end
-		pcs_traits['alko_day'] += 2
-	elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
-		if pcs_traits['alko_status'] = -1:
-			alko += rand(4,5)
-		elseif pcs_traits['alko_status'] = 1:
-			alko += rand(1,2)
-		else
-			alko += 3
+		gs 'stat'
+	end
+
+
+elseif $ARGS[0] = 'breastcream':
+	if $ARGS[0] = 'cikl':
+		if drugVars['breastcream_dose'] >= 1:
+			drugVars['breastcream_dose'] = 0
+
+			temp = pcs_mass['bust'] - pcs_mass['bust_gen']
+			temp = rand(0, 5 + max(0, temp)) / max(1, temp)
+
+			if temp > 0:
+				bodyVars['bust_other'] += 1
+				'Feels like your breasts have grown slightly.'
+			end
+			killvar 'temp'
 		end
-		fat += 6
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
+	else
+		if drugVars['breastcream_dose'] < 1:
+			'<font color = #DB7093>You smear the cream onto your breasts and rub it in.</font>'
+
+			if ARGS[1] = 0 and $ARGS[1] = '':
+				mc_inventory['breastcream'] -= 1
+				if mc_inventory['breastcream'] <= 0: mc_inventory['breastcream'] = 0 & msg 'That was your last bit of breast cream.'
+			end
+
+			drugVars['breastcream_used'] += 1
+			drugVars['breastcream_dose'] = 1
 		else
-			pcs_hydra -= 10
+			'Using any more cream won''t have any effect.'
 		end
-		pcs_traits['alko_day'] += 3
-	elseif $ARGS[1] = 'moonshine':
-		if pcs_traits['alko_status'] = -1:
-			alko += rand(7,8)
-		elseif pcs_traits['alko_status'] = 1:
-			alko += rand(2,3)
-		else
-			alko += 5
+		gs 'stat'
+	end
+
+elseif $ARGS[0] = 'painkiller':
+	if ARGS[1] = 0 and $ARGS[1] = '':
+		mc_inventory['painkillers'] -= 1
+		if mc_inventory['painkillers'] <= 0: mc_inventory['painkillers'] = 0 & msg 'That was your last painkiller.'
+	end
+
+	drugVars['painkillers_used'] += 1
+	pain['killer'] += 1
+	gs 'stat'
+
+elseif $ARGS[0] = 'alcohol':
+	if $ARGS[1] = 'stat':
+		if alko > 9:
+			pain['relief'] = 70
+		elseif alko > 6:
+			pain['relief'] = 40
+		elseif alko > 3:
+			pain['relief'] = 15
 		end
-		fat += 6
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
+	else
+		if drugVars['cheat_immune'] = 0: 
+			drugVars['alcohol_used'] += 1
+			if drugVars['alcohol_used'] > 15 and drugVars['alcohol_exp'] = 0: drugVars['alcohol_exp'] = 1
+		end	
+
+		if ARGS[2] <= 1: 
+			temp_alc_count = 1
 		else
-			pcs_hydra -= 10
+			temp_alc_count = ARGS[2]
 		end
-		pcs_traits['alko_day'] += 5
-	else
-		'<br><font color = red>Developer note: The type of alcohol is missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
+
+		:alcohol_jump
+			temp_alc_count -= 1
+			pcs_health -= 5
+			pcs_energy -= 5
+
+			if $ARGS[1] = 'beer':
+				if pcs_traits['alko_status'] = -1:
+					alko += rand(1,2)
+				elseif pcs_traits['alko_status'] = 1:
+					alko += rand(0,1)
+				else
+					alko += 1
+				end
+				pcs_traits['alko_day'] += 1
+
+				fat += 3
+				pcs_mood += 10
+				if pcs_hydra >= 100:
+					pcs_hydra += 5
+				else
+					pcs_hydra += 10
+				end
+
+			elseif $ARGS[1] = 'wine' or $ARGS[1] = 'champagne':
+				if pcs_traits['alko_status'] = -1:
+					alko += 3
+				elseif pcs_traits['alko_status'] = 1:
+					alko += 1
+				else
+					alko += 2
+				end
+				pcs_traits['alko_day'] += 2
+
+				fat += 4
+				pcs_mood += 20
+				if pcs_hydra >= 100:
+					pcs_hydra += 5
+				else
+					pcs_hydra += 10
+				end
+
+			elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
+				pcs_traits['alko_day'] += 3
+				if pcs_traits['alko_status'] = -1:
+					alko += rand(4,5)
+				elseif pcs_traits['alko_status'] = 1:
+					alko += rand(1,2)
+				else
+					alko += 3
+				end
+
+				fat += 6
+				if pcs_hydra >= 100:
+					pcs_hydra -= 5
+				else
+					pcs_hydra -= 10
+				end
+
+			elseif $ARGS[1] = 'moonshine':
+				if pcs_traits['alko_status'] = -1:
+					alko += rand(7,8)
+				elseif pcs_traits['alko_status'] = 1:
+					alko += rand(2,3)
+				else
+					alko += 5
+				end
+				pcs_traits['alko_day'] += 5
+
+				fat += 6
+				if pcs_hydra >= 100:
+					pcs_hydra -= 5
+				else
+					pcs_hydra -= 10
+				end
+
+			else
+				'<br><font color = red>Developer note: The type of alcohol: (<<$ARGS[1]>>) is missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
+			end
+		if temp_alc_count > 0: jump 'alcohol_jump'
+		killvar 'temp_alc_count'
+
+		frost = 0
+		pcs_breath = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		gs 'stat'
 	end
-	if alc_count > 0: jump 'alcohol_jump'
-	killvar 'alc_count'
-	gs 'stat'
-elseif $ARGS[0] = 'mentats':
-	mentats_dose += 1
-	mentats_have -= 1
+
 elseif $ARGS[0] = 'aphrodisiac':
-	if aphrodisiac_overdose = 1:
-		$aphrodisiac_msg = '<br>You''ve had enough aphrodisiac for today.'
-	elseif aphrodisiac_timer = 0:
-		$aphrodisiac_msg = '<font color = #DB7093><br>You take a gum and chew it. It tastes like strawberry, but is also kind of spicy.</font>'
-		aphrodisiac_have -= 1
-		aphrodisiac_timer += 8
-		pcs_horny = 80
-	elseif aphrodisiac_timer > 0 and aphrodisiac_timer <= 8:
-		$aphrodisiac_msg = '<font color = #DB7093><br>You take another gum and chew it. It makes your mouth feel kinda tingly.</font>'
-		aphrodisiac_have -= 1
-		aphrodisiac_timer += 8
-		pcs_horny = 100
-	elseif aphrodisiac_timer > 8 and min_arousal < 60:
-		$aphrodisiac_msg = '<font color = red><b><br>You take yet another gum and start chewing it. Suddenly you find yourself in grip of an intense orgasm!<br>It goes on and on and you sink to the ground and do your best to endure it.</b></font>'
-		aphrodisiac_have -= 1
-		orgasm += 1
-		pcs_mood = 100
-		min_arousal += 10
-		aphrodisiac_overdose = 1
-		if min_arousal = 10:
-			pcs_horny = min_arousal
-			$min_arousal_msg = '<font color = #DB7093>That was intense! You can still feel the tingles.</font>'
-		elseif min_arousal = 20:
-			pcs_horny = min_arousal
-			$min_arousal_msg = '<font color = #DB7093>You are really starting to enjoy these! Your crotch still feels kinda hot though.</font>'
-		elseif min_arousal = 30:
-			pcs_horny = min_arousal
-			$min_arousal_msg = '<font color = #DB7093>As you are trying to get back to your feet you notice that you are still horny. What is happening to you?</font>'
-		elseif min_arousal = 40:
-			pcs_horny = min_arousal
-			$min_arousal_msg = '<font color = #DB7093>You are certain of it. Every time those gums give you an orgasm they also increase your libido.</font>'
-		elseif min_arousal = 50:
-			pcs_horny = min_arousal
-			$min_arousal_msg = '<font color = #DB7093>You run a finger across your slit and shudder. You really should stop chewing these gums while you can still think of something other than sex.</font>'
-		elseif min_arousal = 60:
-			pcs_horny = min_arousal
-			$min_arousal_msg = '<font color = #DB7093>You are burning up. You feel like you could fuck anything and everything all day long.</font>'
+	if $ARGS[1] = 'cikl':
+		if drugVars['aphrodisiac_overdose'] = 1: drugVars['aphrodisiac_overdose'] = 0
+		if drugVars['aphrodisiac_timer'] ! 0: drugVars['aphrodisiac_timer']	= 0
+	elseif $ARGS[1] = 'hourly_events':
+		if drugVars['aphrodisiac_timer'] >= 1:
+			!! Changed from pcs_horny < 80 -> pcs_horny < 70 to ensure a minimum increase of +10. Blame Anjuna
+			if pcs_horny < 70:
+				pcs_horny = 80
+			else
+				pcs_horny += 10
+			end
+			drugVars['aphrodisiac_timer'] -= 1
 		end
 	else
-		$aphrodisiac_msg = '<font color = #DB7093>You chew another gum with trepidation, looking forward to more orgasms but nothing happens. Huh. Have you become immune?</font>'
-		aphrodisiac_have -= 1
+		if drugVars['aphrodisiac_overdose'] = 1:
+			$drugVars['aphrodisiac_msg'] = '<br>You''ve had enough aphrodisiac for today.'
+		else
+			if ARGS[1] = 0 and $ARGS[1] = '':
+				mc_inventory['aphrodisiac'] -= 1
+				if mc_inventory['aphrodisiac'] <= 0: mc_inventory['aphrodisiac'] = 0 & msg 'That was your last aphrodisiac pill.'
+			end
+
+			drugVars['aphrodisiac_used'] += 1
+
+			if drugVars['aphrodisiac_timer'] = 0:
+				$drugVars['aphrodisiac_msg'] = '<font color = #DB7093><br>You take a gum and chew it. It tastes like strawberry, but is also kind of spicy.</font>'
+				drugVars['aphrodisiac_timer'] += 8
+				pcs_horny = 80
+			elseif drugVars['aphrodisiac_timer'] > 0 and drugVars['aphrodisiac_timer'] <= 8:
+				$drugVars['aphrodisiac_msg'] = '<font color = #DB7093><br>You take another gum and chew it. It makes your mouth feel kinda tingly.</font>'
+				drugVars['aphrodisiac_timer'] += 8
+				pcs_horny = 100
+			elseif drugVars['aphrodisiac_timer'] > 8 and min_arousal < 60:
+				$drugVars['aphrodisiac_msg'] = '<font color = red><b><br>You take yet another gum and start chewing it. Suddenly you find yourself in grip of an intense orgasm!<br>It goes on and on and you sink to the ground and do your best to endure it.</b></font>'
+				drugVars['aphrodisiac_overdose'] = 1
+				pcs_horny = min_arousal
+
+				orgasm += 1
+				pcs_mood = 100
+				min_arousal += 10
+
+				if min_arousal <= 10:
+					$min_arousal_msg = '<font color = #DB7093>That was intense! You can still feel the tingles.</font>'
+				elseif min_arousal <= 20:
+					$min_arousal_msg = '<font color = #DB7093>You are really starting to enjoy these! Your crotch still feels kinda hot though.</font>'
+				elseif min_arousal <= 30:
+					$min_arousal_msg = '<font color = #DB7093>As you are trying to get back to your feet you notice that you are still horny. What is happening to you?</font>'
+				elseif min_arousal <= 40:
+					$min_arousal_msg = '<font color = #DB7093>You are certain of it. Every time those gums give you an orgasm they also increase your libido.</font>'
+				elseif min_arousal <= 50:
+					$min_arousal_msg = '<font color = #DB7093>You run a finger across your slit and shudder. You really should stop chewing these gums while you can still think of something other than sex.</font>'
+				else
+					$min_arousal_msg = '<font color = #DB7093>You are burning up. You feel like you could fuck anything and everything all day long.</font>'
+				end
+			else
+				$drugVars['aphrodisiac_msg'] = '<font color = #DB7093>You chew another gum with trepidation, looking forward to more orgasms but nothing happens. Huh. Have you become immune?</font>'
+			end
+		end
+		gs 'stat'
 	end
 else
 	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 end
 
+
+
+
 gs 'traits', 'addictive_personality'
 
 --- drugs ---------------------------------
-

locations/etoexhib.qsrc

@@ -1168,9 +1168,9 @@ if $ARGS[0] = 'pos27':
 			minut += 60
 			pcs_mood -= 5
 
-			if mentats_dose > 0:gs 'exp_gain', 'intel', mentats_dose - rand(0,mentats_dose)
-			if pcs_intel < 80:gs 'exp_gain', 'intel', 1 + (mentats_dose - rand(0,mentats_dose))
-			if CloStyle3 = 4 and (pcs_makeup = 1 or pcs_makeup = 2) and teachlevel < 70:teachlevel += 1
+			if drugVars['mentats_dose'] > 0: gs 'exp_gain', 'intel', rand(0, drugVars['mentats_dose'])
+			if pcs_intel < 80: gs 'exp_gain', 'intel', 1 + rand(0, drugVars['mentats_dose'])
+			if CloStyle3 = 4 and (pcs_makeup = 1 or pcs_makeup = 2) and teachlevel < 70: teachlevel += 1
 			if pcs_makeup = 4:teachlevel -= 1
 
 			money += 150
@@ -1635,7 +1635,7 @@ if $ARGS[0] = 'pos53':
 			gt 'etoexhib','pos52'
 		end
 	end
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5

locations/events.qsrc

@@ -352,7 +352,7 @@ if $ARGS[0] = 'snkayf':
 	end
 end
 
-if $ARGS[0] = 'narkozakladka':
+if $ARGS[0] = 'ask_pav_drug_dropoff':
 	*clr & cla
 	'<center><b>Shooting galleries</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
@@ -360,7 +360,7 @@ if $ARGS[0] = 'narkozakladka':
 	'And then he looks at you menacingly "And if I hear that you''ve caused any trouble, well death will seem like a good escape."'
 	act 'Agree':
 		*clr & cla
-		snarkozak = 1
+		drugVars['pav_dropoff'] = 1
 		'<center><b>Shooting galleries</b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 		'You gulp and stammer "I assure you there willl be no problems"'
@@ -369,7 +369,7 @@ if $ARGS[0] = 'narkozakladka':
 	end
 end
 
-if $ARGS[0] = 'snarkozaka':
+if $ARGS[0] = 'pav_drug_dropoff':
 	*clr & cla
 	minut += 20
 	gs 'stat'
@@ -389,7 +389,7 @@ if $ARGS[0] = 'snarkozaka':
 	if money >= 560:
 		act 'Buy and use heroin (560 <b>₽</b>)':
 			money -= 560
-			if SNarkTimes['inject'] < 1:
+			if drugVars['heroin_inject'] < 1:
 				*clr & cla
 				minut += 5
 				drugUser = 1
@@ -399,7 +399,7 @@ if $ARGS[0] = 'snarkozaka':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/den/chase_dragon.jpg"></center>'
 				'You pour the heroin onto some foil, heat it up and then using a straw you quickly inhale the steam.'
 				'The rush is instantaneous, you close your eyes as it rolls over you.'
-				act 'You lay there briefly rolling, before leaving': gt 'events', 'snarkozaka'
+				act 'You lay there briefly rolling, before leaving': gt 'events', 'pav_drug_dropoff'
 			else
 				*clr & cla
 				minut += 5
@@ -410,7 +410,7 @@ if $ARGS[0] = 'snarkozaka':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/event/usingheroin.jpg"></center>'
 				'You buy some heroin and find a quiet place behind the platform to use it, and without thinking twice you shoot up.'
 				'The rush is instantaneous, you close your eyes as it rolls over you.'
-				act 'You lay there briefly rolling, before leaving': gt 'events', 'snarkozaka'
+				act 'You lay there briefly rolling, before leaving': gt 'events', 'pav_drug_dropoff'
 			end
 		end
 	else
@@ -420,9 +420,9 @@ if $ARGS[0] = 'snarkozaka':
 	if money >= 2100:
 		act 'Buy enough cocaine for 5 lines (1800 <b>₽</b>)':
 			money -= 2100
-			dur += 5
+			mc_inventory['cocaine'] += 5
 			minut += 5
-			gt 'events', 'snarkozaka'
+			gt 'events', 'pav_drug_dropoff'
 		end
 	else
 		'You don''t have enough money to buy cocaine.'
@@ -431,8 +431,8 @@ if $ARGS[0] = 'snarkozaka':
 	if money >= 600:
 		act 'Buy 5 Amphetamine (600 <b>₽</b>)':
 			money -= 600
-			amphetamine += 5
-			gt 'events', 'snarkozaka'
+			mc_inventory['amphetamine'] += 5
+			gt 'events', 'pav_drug_dropoff'
 		end
 	else
 		'You don''t have enough money to buy amphetamine.'
@@ -442,9 +442,9 @@ if $ARGS[0] = 'snarkozaka':
 		act 'Buy enough weed for 5 joints (300 <b>₽</b>)':
 			money -= 300
 			drugUser = 1
-			joint += 5
+			mc_inventory['joints'] += 5
 			minut += 5
-			gt 'events', 'snarkozaka'
+			gt 'events', 'pav_drug_dropoff'
 		end
 	else
 		'You don''t have enough money to buy weed.'

locations/exercise.qsrc

@@ -549,8 +549,8 @@ if $ARGS[0] = 'tier1':
 	if $ARGS[3] = '':
 		gs 'exp_gain', $ARGS[2], 1
 		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
-			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
-			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
+			gs 'exp_gain', $ARGS[2], rand(0, drugVars['steroids_dose'])
+			if drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
 		end
 	else
 		i = 2
@@ -558,16 +558,16 @@ if $ARGS[0] = 'tier1':
 		if $ARGS[i] ! '':
 			gs 'exp_gain', $ARGS[i], rand(0,1)
 			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
-				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
+				gs 'exp_gain', $ARGS[i], rand(0, drugVars['steroids_dose'])
 				steroidcheck = 1
 			end
 			i += 1
 			jump 'exploop1'
-		else
-			if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
-			killvar 'steroidcheck'
-			killvar 'i'
 		end
+
+		if steroidcheck = 1 and drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
+		killvar 'steroidcheck'
+		killvar 'i'
 	end
 	mcnt += 1
 	if mcnt < mult: jump 'timeexploop1'
@@ -597,8 +597,8 @@ if $ARGS[0] = 'tier2':
 	if $ARGS[3] = '':
 		gs 'exp_gain', $ARGS[2], rand(2,3)
 		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
-			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
-			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
+			gs 'exp_gain', $ARGS[2], rand(0, drugVars['steroids_dose'])
+			if drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
 		end
 	else
 		i = 2
@@ -606,16 +606,16 @@ if $ARGS[0] = 'tier2':
 		if $ARGS[i] ! '':
 			gs 'exp_gain', $ARGS[i], rand(1,2)
 			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
-				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
+				gs 'exp_gain', $ARGS[i], rand(0, drugVars['steroids_dose'])
 				steroidcheck = 1
 			end
 			i += 1
 			jump 'exploop2'
-		else
-			if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
-			killvar 'steroidcheck'
-			killvar 'i'
 		end
+
+		if steroidcheck = 1 and drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
+		killvar 'steroidcheck'
+		killvar 'i'
 	end
 	mcnt += 1
 	if mcnt < mult: jump 'timeexploop2'
@@ -645,25 +645,25 @@ if $ARGS[0] = 'tier3':
 	if $ARGS[3] = '':
 		gs 'exp_gain', $ARGS[2], rand(3,5)
 		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
-			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
-			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
+			gs 'exp_gain', $ARGS[2], rand(0, drugVars['steroids_dose'])
+			if drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
 		end
 	else
 		i = 2
 		:exploop3
 		if $ARGS[i] ! '':
 			gs 'exp_gain', $ARGS[i], rand(2,3)
-			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
-				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
+			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren':
+				gs 'exp_gain', $ARGS[i], rand(0, drugVars['steroids_dose'])
 				steroidcheck = 1
 			end
 			i += 1
 			jump 'exploop3'
-		else
-			if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
-			killvar 'steroidcheck'
-			killvar 'i'
 		end
+
+		if steroidcheck = 1 and drugVars['steroids_dose'] > 0 and rand(1,5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
+		killvar 'steroidcheck'
+		killvar 'i'
 	end
 	mcnt += 1
 	if mcnt < mult: jump 'timeexploop3'
@@ -693,8 +693,8 @@ if $ARGS[0] = 'tier4':
 	if $ARGS[3] = '':
 		gs 'exp_gain', $ARGS[2], rand(7,10)
 		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
-			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
-			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
+			gs 'exp_gain', $ARGS[2], rand(0, drugVars['steroids_dose'])
+			if drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
 		end
 	else
 		i = 2
@@ -702,16 +702,16 @@ if $ARGS[0] = 'tier4':
 		if $ARGS[i] ! '':
 			gs 'exp_gain', $ARGS[i], rand(3,5)
 			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
-				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
+				gs 'exp_gain', $ARGS[i], rand(0, drugVars['steroids_dose'])
 				steroidcheck = 1
 			end
 			i += 1
 			jump 'exploop4'
-		else
-			if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
-			killvar 'steroidcheck'
-			killvar 'i'
 		end
+
+		if steroidcheck = 1 and drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
+		killvar 'steroidcheck'
+		killvar 'i'
 	end
 	mcnt += 1
 	if mcnt < mult: jump 'timeexploop4'

locations/exp_gain.qsrc

@@ -9,7 +9,7 @@
 
 if ARGS[1] > 0:
 !!	Prevents EXP gain for stren_plus if its 50 or higher and Sveta ISNT using steroids
-	if $ARGS[0] = 'stren_plus' and stren_plus_lvl >= 50 and steroid_dose = 0:
+	if $ARGS[0] = 'stren_plus' and stren_plus_lvl >= 50 and drugVars['steroids_dose'] = 0:
 		exit
 	end
 

locations/gad_church.qsrc

@@ -190,14 +190,14 @@ if $ARGS[0] = 'pray':
 			pcs_mood += 50
 			church_moral += 1
 			minut += rand(30,60)
-			if nark > 1: nark = nark/2
+			if drugVars['cocaine_system'] > 1: drugVars['cocaine_system'] = drugVars['cocaine_system'] / 2
 			'The Nave is lit only with small candles, leaving your surroundings in darkness, but you find it comforting. You get the urge to pray very intensely, and before you know it, an hour has passed, and you feel cleansed.'
 		else
 			pcs_horny = 0
 			pcs_mood = 100
 			church_moral += 1
 			minut += 60
-			if nark > 1: nark = ((nark/4)*3)
+			if drugVars['cocaine_system'] > 1: drugVars['cocaine_system'] = 3 * drugVars['cocaine_system'] / 4
 			'The Nave is lit only with candles and small presence lights, and the darkness feels very comforting, like being in the womb. You get the urge to pray very intensely, and before you know it, more than an hour has passed, and you feel reborn and cleansed.'
 		end
 		gs 'stat'

locations/gadbana.qsrc

@@ -165,8 +165,7 @@ if mira_guest = 0:
 			act 'Take a painkiller':
 				cla
 				menu_off = 1
-				pain['killer'] += 1
-				mc_inventory['painkillers'] -= 1
+				gs 'drugs', 'painkiller'
 				pcs_hydra += 20
 				gs 'stat'
 
@@ -198,8 +197,8 @@ if mira_guest = 0:
 		'You have <b><<mc_inventory[''sanitary_pads'']>></b> pads.'
 	end
 
-	if bcream_have > 0:
-		'<a href="exec:dynamic $use_bcream & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<bcream_have>>.'
+	if mc_inventory['breastcream'] > 0:
+		'<a href="exec: gs ''drugs'', ''breastcream'' & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
 	end
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):

locations/gas_station_gp_117.qsrc

@@ -185,15 +185,14 @@ if $ARGS[0] = 'restroom':
 		'<br>You don''t have enough money to use the restroom.'
 	end
 
-	if joint > 0:
+	if mc_inventory['joints'] > 0:
 		act 'Smoke a joint':
 			*clr & cla
 			menu_off = 1
-			minut += 5
+			minut += 15
+			gs 'drugs', 'joint'
 			'<center><img <<$set_imgh>> src="images/shared/drugs/joint_smoking.jpg"></center>'
 			'You go behind the restrooms and pull a joint out of your purse and light it up. Not before long you''re starting to feel the relaxing effects as you''re getting high.'
-			gs 'drugs', 'joint'
-			gs 'stat'
 			act 'Go back': gt 'gas_station_gp_117', 'restroom'
 		end
 	end
@@ -262,7 +261,7 @@ if $ARGS[0] = 'restroom_women':
 	'A <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair hangs over each sink.'
 	act 'Go outside': minut += 1 & gt 'gas_station_gp_117', 'restroom'
 
-	if dur > 0 and narkday ! daystart:
+	if mc_inventory['cocaine'] > 0 and drugVars['cocaine_day'] ! daystart:
 		act 'Do a line of cocaine (0:05)':
 			*clr & cla
 			menu_off = 1
@@ -300,7 +299,7 @@ if $ARGS[0] = 'restroom_men':
 
 	act 'Go outside': minut += 1 & gt 'gas_station_gp_117', 'restroom'
 
-	if dur > 0 and narkday ! daystart:
+	if mc_inventory['cocaine'] > 0 and drugVars['cocaine_day'] ! daystart:
 		act 'Do a line of cocaine (0:05)':
 			*clr & cla
 			menu_off = 1

locations/gopnik_initiation.qsrc

@@ -543,7 +543,7 @@ if $ARGS[0] = 'tPauline':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big24.jpg"></center>'
 	'You approach Pauline as she angrily turns towards you. "What the fuck what you want?!"'
-	if smoker >= 20:
+	if drugVars['cigarettes_used'] >= 20:
 		'Surprised by her reaction, you lower your gaze. "I saw you were having a smoke and I wanted to ask if I could have one?"'
 		'Pauline sighs and hands over a pack of cigarettes.'
 		act 'Thank her':
@@ -555,7 +555,7 @@ if $ARGS[0] = 'tPauline':
 			'"I know the feeling. I usually always get that feeling after kicking someone''s ass," she replies.'
 			minut += 2
 			pcs_mood += 10
-			gs 'shortgs','smoker'
+			gs 'drugs','smoke'
 			gs 'stat'
 			act 'Sounds like a bad habit':
 				*clr & cla

locations/gschool_coolkid_chats.qsrc

@@ -128,10 +128,10 @@ if $ARGS[0] = 'dim_drugs':
 	'He smiles at you with a smug grin. "Sure. Do you have any money?"'
 	if money >= 420:
 		act 'Change your mind': gt 'gschool_lessons', 'short_break'
-		if money >= 420: act 'Buy enough for 1 line (420 <b>₽</b>)': palelady = 1 & gt 'gschool_coolkid_chats', 'dimka_pay'
-		if money >= 840: act 'Buy enough for 2 lines (840 <b>₽</b>)': palelady = 2 & gt 'gschool_coolkid_chats', 'dimka_pay'
-		if money >= 1680: act 'Buy enough for 5 lines (1680 <b>₽</b>)': palelady = 5 & gt 'gschool_coolkid_chats', 'dimka_pay'
-		if money >= 3720: act 'Buy enough for 10 lines (3320 <b>₽</b>)': palelady = 10 & gt 'gschool_coolkid_chats', 'dimka_pay'
+		if money >= 420: act 'Buy enough for 1 line (420 <b>₽</b>)': gt 'gschool_coolkid_chats', 'dimka_pay', 1
+		if money >= 840: act 'Buy enough for 2 lines (840 <b>₽</b>)': gt 'gschool_coolkid_chats', 'dimka_pay', 2
+		if money >= 1680: act 'Buy enough for 5 lines (1680 <b>₽</b>)': gt 'gschool_coolkid_chats', 'dimka_pay', 5
+		if money >= 3720: act 'Buy enough for 10 lines (3320 <b>₽</b>)': gt 'gschool_coolkid_chats', 'dimka_pay', 10
 	else
 		*nl
 		'You bite your lower lip nervously and look down as you shake your head. "No, but can you just give me some now and I can pay you back later? Please?"'
@@ -144,9 +144,8 @@ end
 
 if $ARGS[0] = 'dimka_pay':
 	*clr & cla
-	money -= palelady * 420
-	dur += palelady
-	palelady = 0
+	money -= ARGS[1] * 420
+	mc_inventory['cocaine'] += ARGS[1]
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/drugs/cocainebag.jpg"></center>'
 	'You nod your head and dig around in your purse before pulling out the money and quickly handing it to him. He takes his time slowly counting it out, which seems like an eternity before he finally hands over a small baggy. You snatch it from him and quickly leave.'
@@ -197,7 +196,7 @@ if $ARGS[0] = 'dimka_sex':
 						'He puts his dick away and buttons up his pants. "I want my money by next week," he demands before he walks out, leaving you to get cleaned up on your own.'
 						act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 					else
-						dur += 1
+						mc_inventory['cocaine'] += 1
 						dimka_debt += 2000
 						'He puts his dick away and buttons up his pants. "I want my money by next week," he demands before tossing a small baggy of white power on the floor before walking out, leaving you to get cleaned up on your own. Not even thinking about the cum on your face, you quickly snatch up the baggy.'
 						act 'Time for the next class': gt 'gschool_lessons', 'short_break'

locations/gschool_grounds.qsrc

@@ -190,7 +190,7 @@ if $ARGS[0] = 'main':
 
 	act 'Go to the sports field': minut += 1 & gt 'gschool_grounds', 'sports'
 
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint behind the school building': gs 'drugs', 'joint' & gt $loc, $loc_arg
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint behind the school building': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 
 	if week = 6 and hour = 8 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and detention_set = 1 and SchoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 

locations/gschool_lessons4.qsrc

@@ -1962,12 +1962,11 @@ if $ARGS[0] = 'post_dress':
 			act'Continue':gt 'gschool_lessons4', 'post_dress'
 		end
 	end
-	if joint >= 1:
+	if mc_inventory['joints'] > 0:
 		act 'Smoke a joint':
 			*clr & cla
-			gs 'drugs', 'joint', 1
-			minut += 5
-			gs 'stat'
+			minut += 15
+			gs 'drugs', 'joint'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/smokejoint.jpg"></center>'
 			'You feel the urge to get high before you leave school, so you take a seat on one of the benches and take a joint out of your purse, placing it between your lips before lighting it up and taking a long drag. You quickly feel yourself relaxing and smile as you lean back against the lockers. You spend the next few minutes smoking the joint until you''re as high as a kite. Once you''re done, you throw the roach in one of the toilets.'
 			act'Continue':gt 'gschool_lessons4', 'post_dress'

locations/hookahlounge.qsrc

@@ -52,9 +52,8 @@ if $ARGS[0] = 'Smoke_Hookah':
 		cla & *clr
 		smoketab = 0
 		minut += 60
-		gs 'stat'
-		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'
 		act 'Stop using Hookah': gt 'hookahlounge', 'start'

locations/hookup_after.qsrc

@@ -853,9 +853,8 @@ 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
-					mc_inventory['cigarettes'] += 1
-					siga_bum = 1
-					gs 'drugs', 'smoke'
+					gs 'drugs', 'smoke', 1
+
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 					'He leans over with the lighter and lights it for you and you inhale with him, savoring the smoke that fills your lungs as the two of you sit back and puff away together.'
 					gs 'hookup_after', 'pre'
@@ -870,9 +869,8 @@ if $ARGS[0] = 'light_cigarette':
 					'You decide to grab a smoke too, pulling one from your purse. You place it in your mouth, sparking it with your lighter while you inhale.'
 					act'Continue':
 						cla & *clr
-						siga_bum = 1
 						gs 'drugs', 'smoke'
-						gs 'stat'
+
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 						'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed as both of you unwind with a post-fuck smoke together.'
 						gs 'hookup_after', 'pre'
@@ -890,7 +888,7 @@ if $ARGS[0] = 'light_cigarette':
 				act'Continue':
 					cla & *clr
 					gs 'drugs', 'smoke'
-					gs 'stat'
+
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
 					'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed.'
 					gs 'hookup_after', 'pre'
@@ -911,9 +909,8 @@ 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
-			mc_inventory['cigarettes'] += 1
-			siga_bum = 1
-			gs 'drugs', 'smoke'
+			gs 'drugs', 'smoke', 1
+
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 			'He leans over with the lighter and lights it for you and you inhale with him, savoring the smoke that fills your lungs as the two of you sit back and puff away together.'
 			gs 'hookup_after', 'pre'
@@ -929,7 +926,7 @@ if $ARGS[0] = 'light_cigarette2':
 			act'Continue':
 				cla & *clr
 				gs 'drugs', 'smoke'
-				gs 'stat'
+
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 				'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed as both of you unwind with a post-fuck smoke together.'
 				gs 'hookup_after', 'pre'
@@ -1403,8 +1400,9 @@ if $ARGS[0] = 'start':
 		'The two of you let the conversation die off as you puff away at the last of nubs of your cigarette.'
 	elseif hookup['cigarette'] = 3:
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/after/phone_smoke.jpg"></center>'
 		gs 'drugs', 'smoke'
+
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/phone_smoke.jpg"></center>'
 		if npc_smoker[$boy] > 0:
 			'Reaching down to your purse, you pull out your phone and a cigarette, sparking the latter and taking a long enjoyable drag from it. <<$npc_firstname[$boy]>> sees you light up and does the same, pulling his own smokes from his nightstand. The two of your relax, smoking together, while you unwind checking messages and scrolling through social media feeds.'
 		else
@@ -1412,20 +1410,21 @@ if $ARGS[0] = 'start':
 		end
 	elseif npc_smoker[$boy] > 0 and hookup['cigarette'] = 2:
 		cla & *clr
+		gs 'drugs', 'smoke', 1
+
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
-		mc_inventory['cigarettes'] += 1
-		siga_bum = 1
-		gs 'drugs', 'smoke'
 		'The two of you lay back and relax, enjoying a post-fuck smoke together as you wind down.'
 	elseif npc_smoker[$boy] > 0 and hookup['cigarette'] = 1:
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 		gs 'drugs', 'smoke'
+
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 		'Seeing you light up, <<$npc_firstname[$boy]>> does as well, pulling a pack from his nightstand. You spark the end with your lighter and relax, taking a long drag, relishing the flavor as it fills your mouth and lungs. The two of you just sit there in silence for a few minutes, enjoying a post-fuck smoke together as you wind down.'
 	elseif hookup['cigarette'] = 1:
 		cla & *clr
 		gs 'drugs', 'smoke'
 		gs 'stat'
+
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
 		'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed.'
 	elseif npc_smoker[$boy] > 0:

locations/hourly_events.qsrc

@@ -32,13 +32,6 @@ if scpopt > 1: scpopt = 0
 if insleep = 1:
 	pcs_energy -= (succublvl / 2)
 	pcs_hydra  -= (succublvl / 2)
-	if amphHigh > 0:
-		pcs_energy -= (4 / amphetamineBonus)
-		pcs_hydra  -= (8 / amphetamineBonus)
-	else
-		pcs_energy -= (4 * amphetamineBonus)
-		pcs_hydra  -= (8 * amphetamineBonus)
-	end
 
 	pcs_stam += iif(pcs_sleep > 90, stammax/2, iif(pcs_sleep > 80, stammax/4, stammax/8))
 
@@ -51,13 +44,7 @@ if insleep = 1:
 else
 	pcs_energy -= succublvl
 	pcs_hydra  -= succublvl
-	if amphHigh > 0:
-		pcs_energy -= ( 8 / amphetamineBonus)
-		pcs_hydra  -= (16 / amphetamineBonus)
-	else
-		pcs_energy -= ( 8 * amphetamineBonus)
-		pcs_hydra  -= (16 * amphetamineBonus)
-	end
+
 
 	if hypnoAddict > 0: dynamic $hypnoAddiction
 
@@ -100,6 +87,13 @@ else
 	pcs_willpower_feeder = pcs_willpower_feeder mod 100
 end
 
+gs 'drugs', 'smoke', 'hourly_events'
+gs 'drugs', 'joint', 'hourly_events'
+gs 'drugs', 'heroin', 'hourly_events'
+gs 'drugs', 'cocaine', 'hourly_events'
+gs 'drugs', 'amphetamine', 'hourly_events'
+gs 'drugs', 'aphrodisiac', 'hourly_events'
+
 
 !!=======================================================!!
 !!                      !!Willpower!!                    !!
@@ -149,7 +143,7 @@ end
 
 
 !! code to trigger vomitting based on morning sickness, hangovers, or just plain bad luck
-if Insleep = 0:   
+if Insleep = 0:
 	vomit['daily_check'] = 0
 
 !!if Insleep = 1:
@@ -159,7 +153,7 @@ else
 
 		if alko > 4:
 			vomit['hangover'] = 1
-		 
+		
 		elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
 			vomit['morning_sick'] = 1
 		
@@ -193,81 +187,11 @@ elseif alko < 0:
 	alko = 0
 end
 
-if shame > 0: 
+if shame > 0:
 	shame -= 1
 	pcs_mood -= 5
 end
 
-!!NarkImmune = 0
-if smoker >= 20 and NarkImmune = 0: smokerNeed += 1
-if smokerNeed > 10 and InSleep = 0 and pcs_mood > 20 and NarkImmune = 0: pcs_mood -= pcs_mood / 10
-
-if smokerNeed > 300: 
-	smokerNeed = 0
-	smoker = 0
-end
-
-if StrongNarkota > 0: 
-	pcs_mood -= (40 / StrongNarkota)
-	StrongNarkota -= 1
-end
-
-if amphWithdrawl >= 5: 
-	amphWithdrawl += 1
-	pcs_mood -= (amphWithdrawl / 5)
-end
-
-if amphHigh > 0:
-	if amphWithdrawl < 2: amphWithdrawl = 2
-	amphetamineBonus = 3
-	amphHigh -= 4
-	pcs_mood += (2 * amphHigh)
-
-elseif amphHigh <= 0 and amphWithdrawl = 2:
-	if amphIntake > 0:
-		amphIntake -= 1
-	else
-		amphWithdrawl = 0
-	end
-
-	amphHigh = 0
-	amphetamineBonus = 2
-	pcs_mood -= pcs_mood / 10
-
-elseif amphIntake > 0:
-	amphWithdrawl += 1
-
-elseif amphHigh = 0 and amphWithdrawl = 0:
-	amphetamineBonus = 1
-end
-
-if amphWithdrawl > 169: 
-	amphWithdrawl = 1
-	amphetamineBonus = 1
-	amphCount = 0
-end
-
-if SLomka > 0 and pcs_mood > 10: 
-	SLomka += 1
-	pcs_mood -= pcs_mood / 10
-end
-if SLomka > 100 and StrongNarkota <= 0: 
-	SLomka = 0
-	SNarkTimes = 0
-end
-
-if jointhigh > 0: jointhigh -= 1
-
-if narkoman = 1 and narkday ! daystart:
-	pcs_health -= 5
-	
-	!! Changed from pcs_mood > 40 -> pcs_mood > 45 to avoid pcs_mood becoming lower than 5. Blame Anjuna
-	if pcs_mood > 45: 
-		pcs_mood -= 40
-	else
-		pcs_mood = 5
-	end
-end
 
 if $pantyworntype = 'none' and PCloPants > 0 and PCloPanties = 0 and $clothingworntype ! 'nude' and pcs_traits['commando_lvl'] < 2:
 	!! mosol += (2 - pcs_traits['commando_lvl'])
@@ -358,15 +282,6 @@ elseif pcs_horny < 10 and (PanThinness >= 5 or BraThinness >= 5):
 	pcs_horny += 5
 end
 
-if aphrodisiac_timer >= 1:
-	!! Changed from pcs_horny < 80 -> pcs_horny < 70 to ensure a minimum increase of +10. Blame Anjuna
-	if pcs_horny < 70:
-		pcs_horny = 80
-	else
-		pcs_horny += 10
-	end
-	aphrodisiac_timer -= 1
-end
 
 if $pantyworntype ! 'none' and clit_size >= 25 and pcs_horny < 60:
 	pcs_horny += 20

locations/hunter_interactions.qsrc

@@ -17,9 +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
-			mc_inventory['cigarettes'] += 1
-			gs 'drugs', 'smoke'
-			gs 'stat'
+			gs 'drugs', 'smoke', 1
 
 			act 'Return to the table': gs 'swamphouse', 'meal_table'
 		end
@@ -32,13 +30,13 @@ if $ARGS[0] = 'smoke_with_hunters':
 			*clr & cla
 
 			if huntersAndreiQw < 15 and huntersKnowSlut = 0 or huntersAndreiLove = 1:
-				'<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
-				mc_inventory['cigarettes'] += 1
-				gs 'drugs', 'smoke'
 				huntersAndreiQw += 1
-				gs 'stat'
+				gs 'drugs', 'smoke', 1
+
+				'<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.'
 
 				act 'Return to the table': gs 'swamphouse', 'meal_table'
 			else

locations/huntersex.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'sexafterstrip1':
 	npc_sex[$boy[3]] += 1
 
 	minut += 5
-	gs 'shortgs','smoker'
+	gs 'drugs','smoke'
 
 	pcs_mood = 100
 
@@ -215,7 +215,7 @@ if $ARGS[0] = 'sexafterstrip3':
 	npc_sex[$boy[3]] += 1
 
 	minut += 5
-	gs 'shortgs','smoker'
+	gs 'drugs','smoke'
 
 	pcs_mood = 100
 

locations/katja_dorm.qsrc

@@ -1459,8 +1459,7 @@ if $ARGS[0] = 'cocain_offer':
 	act 'Do some lines with Katja':
 		*clr & cla
 		minut += 8
-		dur += 1
-		gs 'drugs', 'cocaine'
+		gs 'drugs', 'cocaine', 1
 		gs 'stat'
 		gs 'katja_procedural', 'take_cocaine'
 		gs 'stat'										

locations/katja_nightclub_sex.qsrc

@@ -56,8 +56,7 @@ if $ARGS[0] = 'private_room1':
 					act 'Do some lines':
 						*clr & cla
 						minut += 5
-						dur += 1
-						gs 'drugs', 'cocaine'
+						gs 'drugs', 'cocaine', 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
 						'You take the tube and snort two lines as Katja looks at you with wide-open eyes.'
@@ -73,7 +72,7 @@ if $ARGS[0] = 'private_room1':
 								minut += 8
 								gs 'willpower', 'pay', 'force'
 								gs 'katja_procedural', 'take_cocaine'
-								gs 'stat'										
+								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 								'"Try it. It won''t harm you," you say, but she still looks skeptical.'
 								'"I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea. I don''t think it''s for me," she replies.'
@@ -122,8 +121,7 @@ if $ARGS[0] = 'private_room1':
 					act 'Do some lines but don''t push Katja':
 						*clr & cla
 						minut += 5
-						dur += 1
-						gs 'drugs', 'cocaine'
+						gs 'drugs', 'cocaine', 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
 						'"I''ll take some, but I don''t think my friend will," you say as you take the tube and Katja shakes her head. You put one end of the tube to your nose and the other to the first of the lines he has prepared for you.' 
@@ -145,11 +143,10 @@ if $ARGS[0] = 'private_room1':
 								gs 'willpower', 'drugs', 'force'
 							end
 							gs 'willpower', 'pay', 'force'
-							dur += 1
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
 							gs 'stat'
 							gs 'katja_procedural', 'take_cocaine'
-							gs 'stat'										
+							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 							'"Come on, let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 							'She still looks skeptical. "I don''t know, <<$pcs_nickname>>... I''m not sure it''s a good idea," she replies.'
@@ -210,7 +207,7 @@ if $ARGS[0] = 'private_room1':
 								*clr & cla
 								minut += 5
 								gs 'katja_procedural', 'take_cocaine'
-								gs 'stat'										
+								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 								'You watch as Katja takes the tube, puts one end at her nose and bends down to the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
 								'She sniffs the line with no problem and just sits up waiting for the the drugs to hit her.' 
@@ -225,11 +222,10 @@ if $ARGS[0] = 'private_room1':
 					act 'Do some lines with Katja (<<will_cost>> Willpower)':
 						*clr & cla
 						minut += 8
-						dur += 1
-						gs 'drugs', 'cocaine'
+						gs 'drugs', 'cocaine', 1
 						gs 'stat'
 						gs 'katja_procedural', 'take_cocaine'
-						gs 'stat'										
+						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 						'"Come on, let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 						'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube, which she happily takes.'
@@ -297,7 +293,7 @@ if $ARGS[0] = 'private_room1':
 								*clr & cla
 								minut += 5
 								gs 'katja_procedural', 'take_cocaine'
-								gs 'stat'										
+								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 								'You watch as Katja takes the tube, puts one end at her nose and bends down so the other end is at the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
 								'She sniffs the line like a pro and sits up, waiting for the drugs to hit her.' 
@@ -312,11 +308,10 @@ if $ARGS[0] = 'private_room1':
 					act 'Do some lines with Katja':
 						*clr & cla
 						minut += 8
-						dur += 1
-						gs 'drugs', 'cocaine'
+						gs 'drugs', 'cocaine', 1
 						gs 'stat'
 						gs 'katja_procedural', 'take_cocaine'
-						gs 'stat'										
+						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 						'"Okay, let''s do it together," you say.'
 						'"Yes! That''s the spirit," she replies. She''s already taken the tube from <<$npc_nickname[$npclastgenerated]>>, so he quickly produces another one and hands it to you.'

locations/katja_party.qsrc

@@ -425,10 +425,9 @@ if $ARGS[0] = 'party_heading_out':
 		act 'Do some lines with Katja':
 			*clr & cla
 			minut += 8
-			dur += 1
-			gs 'drugs', 'cocaine'
+			gs 'drugs', 'cocaine', 1
 			gs 'katja_procedural', 'take_cocaine'
-			gs 'stat'										
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 			'"OK, Katja. Let''s do it together," you say.'
 			'"Yes. That''s the spirit," she replies. She then prepares some lines for the two of you and finds some tubes to use to snort the cocaine.'
@@ -440,7 +439,7 @@ if $ARGS[0] = 'party_heading_out':
 		end
 	elseif katjaQW['coke_stage'] >= rand(4,7) and katjaQW['coke_day'] ! daystart: 
 		'"You know, <<$pcs_nickname>>. We sometimes take some cocaine when we are partying. If you have any, then maybe we could take some now?" Katja asks, looking at you '+iif(katjaQW['coke_stage'] = 4, 'nervously.', 'with pleading eyes.')
-		if dur >= 2:
+		if mc_inventory['cocaine'] >= 2:
 			gs 'willpower', 'drugs', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Tell Katja that you don''t want to take drugs right now (<<will_cost>> Willpower)':
@@ -458,10 +457,10 @@ if $ARGS[0] = 'party_heading_out':
 			act 'Do some lines with Katja':
 				*clr & cla
 				minut += 8
-				dur -= 1
+				mc_inventory['cocaine'] -= 1
 				gs 'drugs', 'cocaine'
 				gs 'katja_procedural', 'take_cocaine'
-				gs 'stat'										
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 				'"I do have enough for the two of us. So let''s have some fun before we leave," you say.'
 				'"Yes. That''s the spirit," she replies. You then prepare some lines for the two of you and find some tubes to use to snort the cocaine.'
@@ -472,12 +471,12 @@ if $ARGS[0] = 'party_heading_out':
 				act 'Go to the metro': minut += 10 & gt 'katja_city',  'metro'
 			end
 		else
-			'"I don''t have '+iif(dur = 1, 'enough for both of us', 'any')+'," you say.'
+			'"I don''t have ' + iif(mc_inventory['cocaine'] = 1, 'enough for both of us', 'any')+'," you say.'
 			'"No problem. Maybe we''ll meet somebody that does," Katja says. "Let''s go."'
 			act 'Go to the metro': minut += 10 & gt 'katja_city',  'metro'
 		end
 	else
-		if dur >= 2 and katjaQW['coke_stage'] >= 0:
+		if mc_inventory['cocaine'] >= 2 and katjaQW['coke_stage'] >= 0:
 			act 'Suggest you do a couple of lines of cocaine before you go':
 				if katjaQW['coke_stage'] = 0:
 					if cocaine_count = 0:
@@ -509,8 +508,8 @@ if $ARGS[0] = 'party_heading_out':
 									*clr & cla
 									minut += 8
 									gs 'katja_procedural', 'take_cocaine'
-									dur -= 1
-									gs 'drugs', 'cocaine'									
+									mc_inventory['cocaine'] -= 1
+									gs 'drugs', 'cocaine'
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 									'You clear the table and make some lines of cocaine like you were instructed to. You find some tubes for you and Katja to use and explain to her how to do it.'
@@ -569,9 +568,9 @@ if $ARGS[0] = 'party_heading_out':
 									*clr & cla
 									minut += 8
 									gs 'willpower', 'pay', 'force'
-									dur = -1
+									mc_inventory['cocaine'] -= 1
 									gs 'katja_procedural', 'take_cocaine'
-									gs 'stat'										
+									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 									'"Come on, Katja. Just try it. It won''t harm you," you say, but Katja still looks skeptical.'
 									'"I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea. I don''t think it''s for me," she replies.'
@@ -637,9 +636,9 @@ if $ARGS[0] = 'party_heading_out':
 							end
 							gs 'willpower', 'pay', 'force'
 							gs 'drugs', 'cocaine'
-							dur -= 1
+							mc_inventory['cocaine'] -= 1
 							gs 'katja_procedural', 'take_cocaine'
-							gs 'stat'										
+							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 							'"Come on, Katja. Let''s do it together," you say and start cleaning the table.'
 							'She still looks skeptical. "I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea," she replies.'
@@ -675,9 +674,9 @@ if $ARGS[0] = 'party_heading_out':
 						*clr & cla
 						minut += 8
 						gs 'drugs', 'cocaine'
-						dur -= 1
+						mc_inventory['cocaine'] -= 1
 						gs 'katja_procedural', 'take_cocaine'
-						gs 'stat'										
+						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'
 						'You put your tubes to your nostrils and lower your heads to the table and snort your lines. Katja does it with great enthusiasm.' 
@@ -694,9 +693,9 @@ if $ARGS[0] = 'party_heading_out':
 						*clr & cla
 						minut += 8
 						gs 'drugs', 'cocaine'
-						dur -= 1
+						mc_inventory['cocaine'] -= 1
 						gs 'katja_procedural', 'take_cocaine'
-						gs 'stat'										
+						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'
 						'You both put your tubes to you nostrils and lower your heads to the table and snort your lines. Katja does it like it''s something she does all the time.' 

locations/katja_uni.qsrc

@@ -1013,16 +1013,16 @@ if $ARGS[0] = 'studying_exam':
 		study_mod -= 20
 		'You''re feeling a little tipsy, but feel like you''re doing great. However, Katja seems quite skeptical of your explanations and corrects you very often.'
 	end
-	if mentats_dose >= 1: study_mod += 30
-	If pcs_mood < 50:
+	if drugVars['mentats_dose'] > 0: study_mod += 30
+	if pcs_mood < 50:
 		study_mod -= 20
 		'You''re in a bad mood and it clearly affects your studying. Katja tries to cheer you up, but it doesn''t help much.'
 	end
-	if StrongNarkota > 0 or jointhigh > 0:
+	if drugVars['heroin_high'] > 0 or drugVars['weed_high'] > 0:
 		study_mod -= 40
 		'You''re stoned, which makes it hard to concentrate on studying. You mostly just agree with everything Katja is saying.'
 	end
-	if amphHigh > 0: study_mod += 20
+	if drugVars['amphetamine_high'] > 0: study_mod += 20
 	if pcs_energy < 5:
 		study_mod -= 20
 		'You''re extremely hungry and it''s hard to think about anything other than food.'

locations/kinoM.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'a':
 	act 'Watch the movie':
 		cla
 		loverrelation[lover_number] -= 1
-		gs 'exp_gain', 'intel', 1 + (mentats_dose - rand(0,mentats_dose))
+		gs 'exp_gain', 'intel', 1 + rand(0, drugVars['mentats_dose'])
 		'The movie proves interesting and you sit through the whole thing without interruption.'
 		xgt 'kinoM', 'b'
 	end

locations/korr.qsrc

@@ -166,9 +166,9 @@ if BurgerQW['IlyQW']  = 3 and hour >= 9 and hour <= 20:
 			pcs_leghair = 12
 			pcs_pubes = 30
 			bfa = 0
-			narkoman = 0
-			nark = 0
-			SLomka = 0
+			drugVars['cocaine_addict'] = 0
+			drugVars['cocaine_system'] = 0
+			drugVars['heroin_need'] = 0
 			work = 0
 			workKafe['job'] = 0
 			workhosp = 0

locations/korr2x.qsrc

@@ -133,9 +133,9 @@ if BurgerQW['IlyQW']  = 3 and hour >= 9 and hour <= 20:
 			pcs_leghair = 12
 			pcs_pubes = 30
 			bfa = 0
-			narkoman = 0
-			nark = 0
-			SLomka = 0
+			drugVars['cocaine_addict'] = 0
+			drugVars['cocaine_system'] = 0
+			drugVars['heroin_need'] = 0
 			work = 0
 			workKafe['job'] = 0
 			workhosp = 0

locations/lact_bp.qsrc

@@ -1034,9 +1034,9 @@ if $ARGS[0] = 'milking':
 			'<br>You feel a bit thirsty after pumping.'
 			energytomilkpump = 0
 		end
-		if bcream_used = 1:
+		if drugVars['breastcream_dose'] = 1:
 			pcs_nips += rand(0,2)
-			!!	bcream_used = 0
+			!!	drugVars['breastcream_dose'] = 0
 		end
 		minut += pumptime
 	elseif lactation['active'] > 0 and pain['nipples'] < 60 and lactation['pc_aware'] <= 0:
@@ -1081,9 +1081,9 @@ if $ARGS[0] = 'milking':
 		if lactation['prolactinlvl'] > 100:
 			'After finishing, your breasts feel weirdly engorged.'
 		end
-		if bcream_used = 1:
+		if drugVars['breastcream_dose'] = 1:
 			pcs_nips += rand(0,2)
-			bcream_used = 0
+			drugVars['breastcream_dose'] = 0
 		end
 		minut += pumptime
 	else

locations/lesbimistress.qsrc

@@ -863,8 +863,8 @@ end
 if $ARGS[0] = 'neutral_1':
 	mistneutral[1] = 1
 	minut += 150
-	gs 'exp_gain', 'vital', rand(0,2) + rand(0,steroid_dose) & steroidcheck = 1
-	if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose: clit_size += rand(0,1) & killvar 'steroidcheck'
+	gs 'exp_gain', 'vital', rand(0,2) + rand(0, drugVars['steroids_dose']) & steroidcheck = 1
+	if drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub47.jpg"></center>'
 	'Mistress smiles at you kindly: "You''re really beautiful, slave. Do you know that?"'
@@ -1135,8 +1135,8 @@ end
 
 if $ARGS[0] = 'neutral_8':
 	mistneutral[8] = 1
-	gs 'exp_gain', 'vital', rand(0,1) + rand(0,steroid_dose) & steroidcheck = 1
-	if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose: clit_size += rand(0,1) & killvar 'steroidcheck'
+	gs 'exp_gain', 'vital', rand(0, 1) + rand(0, drugVars['steroids_dose'])
+	if drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
 	minut += 120
 	MistressAdoration += 2
 	MistressObedience = 5
@@ -1799,8 +1799,10 @@ if $ARGS[0] = 'amazing_3':
 				pcs_mood += 5
 				! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
 				pcs_willpwr += 1
-				if pcs_stren < 30:gs 'exp_gain', 'stren', 1 + rand(0,steroid_dose) & steroidcheck = 1
-				if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose: clit_size += rand(0,1) & killvar 'steroidcheck'
+				if pcs_stren < 30: 
+					gs 'exp_gain', 'stren', 1 + rand(0, drugVars['steroids_dose'])
+					if drugVars['steroids_dose'] > 0 and rand(1, 5) <= drugVars['steroids_dose']: clit_size += rand(0, 1)
+				end
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub223.jpg"></center>'
 				'Mistress drives you to the pool, and the two of you enter the changing booths. She''s in the booth next to you, probably smirking every time she hears you groan... because she put the dildo on vibrate again. When you''re both leave your booths, she has the remote in her hand and winks at you.'

locations/metro.qsrc

@@ -169,37 +169,37 @@ if $ARGS[0] = 'shop':
 	'He shows you a small box filled with red and blue pills. There are about two dozen of each pill inside.'
 	act 'Leave':gt 'metro','start'
 	if money >= 1000:
-		'<a href="exec:money -= 1000 & mentats_have += 20 & gt ''metro'', ''shop''">Buy neuroboosters</a> 1000 <b>₽</b>'
+		'<a href="exec:money -= 1000 & mc_inventory[''mentats''] += 20 & gt ''metro'', ''shop''">Buy neuroboosters</a> 1000 <b>₽</b>'
 	else
 		'Buy neuroboosters 1000 <b>₽</b> (You do not have enough money)'
 	end
-	'Uses left: <<mentats_have>>'
+	'Uses left: <<mc_inventory[''mentats'']>>'
 	'A pillbox with 10 orange pills inside, the description is removed from the box.'
 	if money >= 500:
-		'<a href="exec:money -= 500 & steroid_have += 10 & gt ''metro'', ''shop''">Buy steroids</a> 500 <b>₽</b>'
+		'<a href="exec:money -= 500 & mc_inventory[''steroids''] += 10 & gt ''metro'', ''shop''">Buy steroids</a> 500 <b>₽</b>'
 	else
 		'Buy steroids 500 <b>₽</b> (You do not have enough money)'
 	end
-	'Uses left: <<steroid_have>>'
+	'Uses left: <<mc_inventory[''steroids'']>>'
 	'Paste tube with two pictures of a woman. In the latter one, she sports an enormous bust.'
 	if money >= 500:
-		'<a href="exec:money -= 500 & bcream_have += 5 & gt ''metro'', ''shop''">Buy breast cream</a> 500 <b>₽</b>'
+		'<a href="exec:money -= 500 & mc_inventory[''breastcream''] += 5 & gt ''metro'', ''shop''">Buy breast cream</a> 500 <b>₽</b>'
 	else
 		'Buy breast cream 500 <b>₽</b> (You do not have enough money)'
 	end
-	'Uses left: <<bcream_have>>'
+	'Uses left: <<mc_inventory[''breastcream'']>>'
 	if $start_type[1] ! 'nomagic':
 		'Packet of pink chewing gum. There are 10 in one package.'
 		if money >= 200:
-			'<a href="exec:money -= 200 & aphrodisiac_have += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'
+			'<a href="exec:money -= 200 & mc_inventory[''aphrodisiac''] += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'
 		else
 			'Buy aphrodisiacs 200 <b>₽</b> (You do not have enough money)'
 		end
-		'Uses left: <<aphrodisiac_have>>'
+		'Uses left: <<mc_inventory[''aphrodisiac'']>>'
 	end
 	if money >= 250:
-		'Buy enough <a href="exec:money -= 250 & joint += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <b>₽</b>'
-		if money >= 500: 'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 10 joints for 500 <b>₽</b>'
+		'Buy enough <a href="exec:money -= 250 & mc_inventory[''joints''] += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <b>₽</b>'
+		if money >= 500: 'Buy enough <a href="exec:money -= 500 & mc_inventory[''joints''] += 10 & gt ''metro'', ''shop''">weed</a> for 10 joints for 500 <b>₽</b>'
 	else
 		'Buy enough weed for 5 joints for 250 <b>₽</b> (You do not have enough money)'
 	end

locations/mey_home.qsrc

@@ -275,13 +275,13 @@ if $ARGS[0] = 'guest_bedroom':
 
 	gs 'events', 'read'
 
-	if dur > 0 and narkday ! daystart:
+	if mc_inventory['cocaine'] > 0 and drugVars['cocaine_day'] ! daystart:
 		act 'Snort the White Lady (0:05)':
+			*clr & cla
 			menu_off = 1
-			cla
-			*clr
 			minut += 5
 			gs 'drugs', 'cocaine'
+
 			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 			*nl
 			'You snort some White Lady, feeling dizzy for a moment. After that, you feel fantastic and incredibly horny.'

locations/music_checks.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'zariyah_approach':
 			ml_approach = 0
 			ml_delparcoQW['Zariyah_Trust'] -= 10
 		!! Check for stoned: if Sveta is stoned the Zariyah will avoid her for now. But they still can meet.
-		elseif StrongNarkota > 20:
+		elseif drugVars['heroin_high'] > 20:
 			ml_approach = 0
 			ml_delparcoQW['Zariyah Trust'] -= 20
 		end
@@ -52,7 +52,7 @@ if $ARGS[0] = 'zariyah_approach':
 		end
 
 		!! Check if Sveta is high
-		if jointhigh > 0:
+		if drugVars['weed_high'] > 0:
 			ml_delparcoQW['Weed Rule'] = 1
 			ml_delparcoQW['Zariyah Trust'] -= 5
 		end
@@ -67,7 +67,7 @@ if $ARGS[0] = 'zariyah_approach':
 		if pregchem > 3450:
 			!! If Sveta is visibly pregnant, and also clearly drank alcohol and/or is high and/or is stoned and/or is dressed like a hooker,
 			!! Zariyah doesn''t want to do anything with her.
-			if alko > 4 or jointhigh > 0 or StrongNarkota > 20 or ml_delparcoQW['Outfit Rule'] = 1:
+			if alko > 4 or drugVars['weed_high'] > 0 or drugVars['heroin_high'] > 20 or ml_delparcoQW['Outfit Rule'] = 1:
 				ml_delparcoQW['Stage'] = 100
 			!! If Sveta is visibly pregnant, Zariyah will talk with her and make an offer for after she gave birth. She doesn''t want a pregnant
 			!! woman in or close to her third semester as a musician, too risky. But later, sure.
@@ -107,7 +107,7 @@ if $ARGS[0] = 'check_if_fired':
 		ml_delparcoQW['Sveta Drunk'] = 1
 		ml_delparcoQW['Stage'] = 100
 	!! Check for stoned: if Sveta shows up to perform stoned, Zariyah will fire her because she is unreliable.
-	elseif StrongNarkota > 20:
+	elseif drugVars['heroin_high'] > 20:
 		ml_delparcoQW['Sveta Stoned'] = 1
 		ml_delparcoQW['Stage'] = 100
 	end
@@ -123,7 +123,7 @@ if $ARGS[0] = 'check_if_can_perform':
 	end
 
 	!! Check if Sveta is high
-	if jointhigh > 0:
+	if drugVars['weed_high'] > 0:
 		ml_delparcoQW['Weed Rule'] = 1
 		ml_delparcoQW['Zariyah Trust'] -= 10
 		ml_perform = 0

locations/natbel_chat.qsrc

@@ -199,7 +199,7 @@ if $ARGS[0] = 'loan_events_chat':
 		end
 	elseif NatbelQW['DebtForgiven'] >= 2:
 		act 'Keep talking': gt 'natbel_chat', 'chat'
-		act 'Stop talking': gt 'natbelapt', 'natroom'		
+		act 'Stop talking': gt 'natbelapt', 'natroom'
 	else
 		if NatbelQW['QWstage'] = 1 and money >= 5000:
 			'Natasha looks down in embarrassment. "<<$pcs_nickname>>, you have lots of money. Could you lend me 5000 <b>₽</b>? I will pay it back, I give you my word."'
@@ -694,6 +694,9 @@ if $ARGS[0] = 'lover_chat':
 			end
 		end
 	end
+	if NatbelQW['FriendLover'] = 4 and NatbelQW['evt_day'] + 14 <= daystart and money > 2550 and hour < 18 and week < 7:
+		act 'Start shopping trip': gt 'natbel_friend', 'shopping_trip'
+	end
 	if NatbelQW['FriendLover'] = 5:
 		act 'Arrange a shopping trip for an outfit':
 			NatbelQW['FriendLover'] = 6
@@ -727,9 +730,6 @@ if $ARGS[0] = 'lover_chat':
 			end
 		end
 	end
-	if NatbelQW['FriendLover'] = 4 and NatbelQW['evt_day'] + 14 <= daystart and money > 2550 and hour < 18 and week < 7:
-		act 'Start shopping trip': gt 'natbel_friend', 'shopping_trip'
-	end
 	if NatbelQW['FriendLover'] = 6 and NatbelQW['evt_day'] + 14 <= daystart and money > 4350 and hour < 18 and week < 7:
 		act 'Start shopping trip': gt 'natbel_friend', 'shopping_trip2'
 	end

locations/nichBedroomServant.qsrc

@@ -111,14 +111,15 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		gs 'events', 'read_porn'
 	end
 
-	if dur > 0:'You have hidden <<dur>> doses of Pale Lady behind your wardrobe.'
+	if mc_inventory['cocaine'] > 0:'You have hidden <<mc_inventory[''cocaine'']>> doses of Pale Lady behind your wardrobe.'
 
-	if dur > 0 and narkday ! daystart:
+	if mc_inventory['cocaine'] > 0 and drugVars['cocaine_day'] ! daystart:
 		act 'Take some cocaine (0:05)':
 			*clr & cla
 			menu_off = 1
 			minut += 5
 			gs 'drugs', 'cocaine'
+
 			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 			'You take a small dose of coke and not long after, you start to feel great, as if you could do anything, <b>be</b> anything - but you''re also starting to feel incredibly horny.'
 

locations/park_walkevents.qsrc

@@ -761,9 +761,8 @@ if $ARGS[0] = '7':
 		act 'Yes':
 			cla
 			pusher = 1
-			dur += 1
-			gs 'drugs', 'cocaine'
-			gs 'stat'
+			gs 'drugs', 'cocaine', 1
+
 			'You''ve never been interested and you''ve never tried it before, but you''re tempted as it''s free. The opportunity is too good to pass on, so you nod your head and the dealer takes out a little bag filled with white powder. He spreads it on your hand and tells you to snort it.'
 			'You nod and snort the white powder. It instantly hits you and you''re feeling on top of the world.'
 			'The guy looks at you and says, "Good shit, right? If you like it, come see me again, it only costs 2,000 <b>₽</b>."'

locations/parks.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start':
 
 	act 'Sit down on the bench':gs 'placer_sex', 'sitting_park_bench'
 	
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 
 	if pcs_inhib >= 35 or exhibitionist_lvl > 0:
 		act 'Flash your tits':

locations/pav_aptcourtev.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = 'bench':
 	if mc_inventory['mag_cooking'] = 1 or mc_inventory['mag_fashion'] = 1 or mc_inventory['mag_computer'] = 1 or mc_inventory['mag_biography'] = 1 or mc_inventory['mag_knitting'] = 1 or mc_inventory['mag_fitness'] = 1: act 'Read a magazine': gt 'pav_aptcourtev', 'read'
 	act 'Play on your phone': gt 'pav_aptcourtev', 'phone'
 	if mc_inventory['cigarettes'] > 0: act 'Smoke': gt 'pav_aptcourtev', 'smoke'
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gt 'pav_aptcourtev', 'smoke_joint'
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': gt 'pav_aptcourtev', 'smoke_joint'
 end
 
 if $ARGS[0] = 'wait':
@@ -102,9 +102,8 @@ end
 if $ARGS[0] = 'smoke_joint':
 	*clr & cla
 	menu_off = 1
-	minut += 10
+	minut += 20
 	gs 'drugs', 'joint'
-	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/benchsmoke.jpg"></center>'
 	'You pull a joint of your purse and light it up. Trying to act like you''re just smoking a cigarette, you take a long slow drag off it as you relax on the bench. You''re soon feeling the effects.'
 	act 'Get up': gt 'pav_complex', 'start'
@@ -336,10 +335,8 @@ if $ARGS[0] = 'events1':
 				act 'Smoke with the boys':
 					*clr & cla
 					minut += 10
-					mc_inventory['cigarettes'] += 1
-					siga_bum = 1
-					gs 'drugs', 'smoke'
-					gs 'stat'
+					gs 'drugs', 'smoke', 1
+
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boysmoke2.jpg"></center>'
 					'You take the cigarette and one of the boys lights it for you. You take a long slow draw off it. "Thanks. I needed that."'
 					'They smile in return. "Sure, no problem."' 
@@ -681,10 +678,8 @@ if $ARGS[0] = 'events2':
 				act 'Smoke with the boys':
 					*clr & cla
 					minut += 10
-					mc_inventory['cigarettes'] += 1
-					siga_bum = 1
-					gs 'drugs', 'smoke'
-					gs 'stat'
+					gs 'drugs', 'smoke', 1
+
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boysmoke2.jpg"></center>'
 					'You take the cigarette and one of the boys lights it for you. You take a long slow draw off it. "Thanks. I needed that."'
 					'They smile in return. "Sure, no problem."' 
@@ -714,7 +709,7 @@ if $ARGS[0] = 'dealer':
 	if money >= 50:
 		act 'Sure':
 			*clr & cla
-			joint += 1
+			mc_inventory['joints'] += 1
 			minut += 1
 			money -= 50
 			gs 'stat'
@@ -726,7 +721,7 @@ if $ARGS[0] = 'dealer':
 	if money >= 500:
 		act 'I''ll take a dozen':
 			*clr & cla
-			joint += 12
+			mc_inventory['joints'] += 12
 			minut += 1
 			money -= 500
 			gs 'stat'

locations/pav_church.qsrc

@@ -895,7 +895,7 @@ if $ARGS[0] = 'pray':
 			pcs_mood += 50
 			church_moral += 1
 			minut += rand(30,60)
-			if nark > 1: nark = nark/2
+			if drugVars['cocaine_system'] > 1: drugVars['cocaine_system'] = drugVars['cocaine_system'] / 2
 			'The Nave is lit only with small candles, leaving your surroundings in darkness, but you find it comforting. You get the urge to pray very intensely and before you know it, an hour has passed and you feel cleansed.'
 		elseif (hour >= 20 or hour <= 6) and church_moral >= 60 and rand(1,100) > 90:
 			pcs_horny = 50
@@ -909,7 +909,7 @@ if $ARGS[0] = 'pray':
 			pcs_mood = 100
 			church_moral += 1
 			minut += 60
-			if nark > 1: nark = ((nark/4)*3)
+			if drugVars['cocaine_system'] > 1: drugVars['cocaine_system'] = 3 * drugVars['cocaine_system'] / 4
 			'The Nave is lit only with candles and small presence lights and the darkness feels very comforting, like being in the womb. You get the urge to pray very intensely and before you know it, more than an hour has passed and you feel reborn and cleansed.'
 		end
 		gs 'stat'

locations/pav_clinic.qsrc

@@ -595,7 +595,7 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if narkoman = 1 and mid($start_type,1,2) = 'sg':
+		if drugVars['cocaine_addict'] = 1 and mid($start_type,1,2) = 'sg':
 			act 'Seek help for your weakness and pain':
 				*clr & cla
 				menu_off = 1

locations/pav_commcenter.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] ! 'XXX':
 
 	if hour >= 8:act 'Go to the toilets': gt 'gdktoilet', 'start'
 
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 	!! ballet career
 	gs 'core_library', 'init'
 

locations/pav_disco_coolkids.qsrc

@@ -245,10 +245,10 @@ if $ARGS[0] = 'dim_drugs':
 	'He smiles at you with a smug grin. "Sure. Do you have any money?"'
 	if money >= 420:
 		act 'Change your mind': gt 'pav_disco_classmates', 'classmates'
-		if money >= 420: act 'Buy enough for 1 lines (420 <b>₽</b>)': palelady = 1 & gt 'pav_disco_coolkids', 'dimka_pay'
-		if money >= 840: act 'Buy enough for 2 lines (840 <b>₽</b>)': palelady = 2 & gt 'pav_disco_coolkids', 'dimka_pay'
-		if money >= 1680: act 'Buy enough for 5 lines (1680 <b>₽</b>)': palelady = 5 & gt 'pav_disco_coolkids', 'dimka_pay'
-		if money >= 3720: act 'Buy enough for 10 lines (3320 <b>₽</b>)': palelady = 10 & gt 'pav_disco_coolkids', 'dimka_pay'
+		if money >= 420: act 'Buy enough for 1 lines (420 <b>₽</b>)': gt 'pav_disco_coolkids', 'dimka_pay', 1
+		if money >= 840: act 'Buy enough for 2 lines (840 <b>₽</b>)': gt 'pav_disco_coolkids', 'dimka_pay', 2
+		if money >= 1680: act 'Buy enough for 5 lines (1680 <b>₽</b>)': gt 'pav_disco_coolkids', 'dimka_pay', 5
+		if money >= 3720: act 'Buy enough for 10 lines (3320 <b>₽</b>)': gt 'pav_disco_coolkids', 'dimka_pay', 10
 	else
 		*nl
 		'You bite your lower lip nervously and look down as you shake your head. "No, but please can you just give me some now and I can pay you back later?" you beg him.'
@@ -261,9 +261,8 @@ end
 
 if $ARGS[0] = 'dimka_pay':
 	*clr & cla
-	money -= palelady * 420
-	dur += palelady
-	palelady = 0
+	money -= ARGS[1] * 420
+	mc_inventory['cocaine'] += ARGS[1]
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/drugs/cocainebag.jpg"></center>'
 	'You nod your head and dig in your purse, pulling out the money and quickly handing it to him. He takes his time slowly counting it out, which seems like an eternity before he finally hands over a small baggy. You snatch it from him and then quickly leave.'

locations/pav_disco_gopniks.qsrc

@@ -1007,8 +1007,7 @@ if $ARGS[0] = 'lavrenti':
 				end	
 				act 'Sure':
 					*clr & cla
-					dur += 1
-					gs 'drugs', 'cocaine'
+					gs 'drugs', 'cocaine', 1
 					grupvalue[4] += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/cocaine.jpg"></center>'

locations/pav_disco_sex.qsrc

@@ -2353,9 +2353,8 @@ end
 
 if $ARGS[0] = 'drugs':
 	*clr & cla
-	if SNarkPriton = 0: SNarkPriton = 1
-	dur += 1
-	gs 'drugs', 'cocaine'
+	if drugVars['city_drugden'] = 0: drugVars['city_drugden'] = 1
+	gs 'drugs', 'cocaine', 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/hotel/snort1.jpg"></center>'
 	'He''s planted a tiny nagging seed in your thoughts, and now you''re too curious to refuse. You give him a nod and walk closer.'

locations/pav_discoev1.qsrc

@@ -1339,15 +1339,14 @@ if $ARGS[0] = 'dimka_sex':
 						'He puts his dick away and buttons up his pants. "I want my money by next week." he growls before walking out, leaving you to get cleaned up on your own.'
 						act 'Go back to the disco': gt 'pav_disco'
 					else
-						dur += 1
 						dimka_debt += 2000
 						'He puts his dick away and buttons up his pants. "I want my money by next week." he growls before tossing a small baggy of white power on the floor as he walks out, leaving you to get cleaned up on your own. Not even thinking about the cum on your face, you quickly snatch up the baggy.'
 						act 'Go back to the disco': gt 'pav_disco'
 						act 'Do a line':
 							*clr & cla
 							minut += 10
-							gs 'stat'
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
+
 							'<center><img <<$set_imgh>> src="images/shared/drugs/lineschool.jpg"></center>'
 							'You get up and rush over to a table. You pour out a line and quickly snort it, immediately feeling the sensation of relief and pleasure rushing through your body. You spend a few moments in a stupor before heading back to the disco.'
 							act 'Go back to the disco': gt 'pav_disco'

locations/pav_library.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'read':
 
 		act 'Read a book on science (1:00)':
 			dynamic $downlibrary['read']
-			gs 'exp_gain', 'intel', rand(3,6) + (mentats_dose - rand(0,mentats_dose))
+			gs 'exp_gain', 'intel', rand(3,6) + rand(0, drugVars['mentats_dose'])
 			grupvalue[3] +=1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/science1.jpg"></center>'

locations/pav_park.qsrc

@@ -306,7 +306,7 @@ if $ARGS[0] = 'start':
 	end
 	act 'Sit on the bench': gt 'pav_park', 'sitting_park_bench'
 
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 
 	!-- Random prostitution solicitation check ------------------------ 
 	gs 'prostitution_functions', 'check_solicitation_event'
@@ -494,7 +494,7 @@ if $ARGS[0] = 'sitting_park_bench':
 	gt $loc, $loc_arg
 end
 
-if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
+if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 
 if (hour >= 20 or hour < 6) and (pcs_sleep <= 30 or cheatNoSleep ! 0):
 	!! Will add a call that will tell if the player has a place to stay at in a given town/city.
@@ -748,7 +748,7 @@ if $ARGS[0] = 'deeper_park':
 	end
 	act 'Sit down on the bench': gt 'pav_park', 'sitting_park_bench'
 
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 
 	gs 'camera', 'check_location'
 end

locations/pav_shared_apt.qsrc

@@ -71,17 +71,17 @@ if $ARGS[0] = 'update':
 		$npc_firstname['A266']+' relationship: '+npc_rel['A266']
 		$npc_firstname['A265']+' relationship: '+npc_rel['A265']
 		$npc_firstname['A264']+' relationship: '+npc_rel['A264']
-		'rentLeft: '+rentLeft
-		'weekNum: '+weekNum
-		'rentWeekNum: '+rentWeekNum
-		'servitudeLvl: '+servitudeLvl
-		'servicePaid: '+servicePaid
-		'cashPaid: '+cashPaid
-		'step: '+step
-		'subStep: '+subStep
-		'nestor_mood: '+nestor_mood
-		'oleg_mood: '+oleg_mood
-		'yakov_mood: '+yakov_mood
+		'rentLeft: ' + rentLeft
+		'weekNum: ' + weekNum
+		'rentWeekNum: ' + rentWeekNum
+		'servitudeLvl: ' + servitudeLvl
+		'servicePaid: ' + servicePaid
+		'cashPaid: ' + cashPaid
+		'step: ' + step
+		'subStep: ' + subStep
+		'nestor_mood: ' + nestor_mood
+		'oleg_mood: ' + oleg_mood
+		'yakov_mood: ' + yakov_mood
 		''
 		oleg_served = 0
 		oleg_mood = 1
@@ -680,15 +680,14 @@ if $ARGS[0] = 'pcsRoom':
 	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
 	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 
-	if dur > 0:'You have <<dur>> doses of Pale Lady, hidden from the other housemates.'
+	if mc_inventory['cocaine'] > 0:'You have <<mc_inventory[''cocaine'']>> doses of Pale Lady, hidden from the other housemates.'
 
-	if dur > 0 and narkday ! daystart:
+	if mc_inventory['cocaine'] > 0 and drugVars['cocaine_day'] ! daystart:
 		act 'Use some Pale Lady (0:05)':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			gs 'drugs', 'cocaine'
-			gs 'stat'
+
 			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 			'You snort some Pale Lady, feeling dizzy for just a moment. After that, you feel fantastic and incredibly horny.'
 

locations/pav_train_hall.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = '':
 		act 'Go to the ticket office': gt 'pav_train_hall', 'ticket'
 	end
 
-	if snarkozak = 1 and narkozakday ! daystart and money >= 1500: act 'Find the drug dealer':gs 'events', 'snarkozaka'
+	if drugVars['pav_dropoff'] = 1 and drugVars['heroin_day'] ! daystart and money >= 1500: act 'Find the drug dealer':gs 'events', 'pav_drug_dropoff'
 
 	if vokzalVork >= 1:
 		if cleZalDay ! daystart or cleMTDay ! daystart or cleWTDay ! daystart:

locations/pod_ezd.qsrc

@@ -271,7 +271,7 @@ if $ARGS[0] = 'roof':
 			gt 'pod_ezd','etaj_5'
 		end
 	end
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
@@ -803,8 +803,7 @@ if $ARGS[0] = 'boys_smoke':
 	act 'Take the cigarette':
 		*clr & cla
 		minut += 5
-		siga_bum = 1
-		gs 'drugs', 'smoke'
+		gs 'drugs', 'smoke', 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/smokeboys.jpg"></center>'
 		if fame['pav_slut'] >= 250 and fame['pav_sex'] < fame['pav_prostitute']:
@@ -1064,8 +1063,7 @@ if $ARGS[0] = 'vasily_smoke':
 						minut +=5
 						pcs_mood +=5
 						npc_rel['A11'] +=1
-						siga_bum = 1
-						gs 'drugs','smoke'
+						gs 'drugs','smoke', 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/vasya.jpg"></center>'
 						'Vasily, also known as Shulga, is usually seen together with his friends Dan and Vitek. Vitek often makes jokes at his expense, but they''re very good friends nevertheless.'
@@ -1079,9 +1077,8 @@ if $ARGS[0] = 'vasily_smoke':
 		end
 		act 'Suck him off quickly': gt 'pod_ezd', 'vasily_smoke_bj'
 	else
-		siga_bum = 1
-		gs 'drugs','smoke'
 		minut +=5
+		gs 'drugs','smoke', 1
 		'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."'
 		'He nods and offers you one. You happily take it and light it up.'
 		act 'Have a chat while you smoke':
@@ -1117,8 +1114,7 @@ end
 if $ARGS[0] = 'smoke_danvas':
 	*clr & cla
 	menu_off = 1
-	siga_bum = 1
-	gs 'drugs','smoke'
+	gs 'drugs','smoke', 1
 	minut +=5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/smoke4.jpg"></center>'
@@ -1272,8 +1268,7 @@ end
 if $ARGS[0] = 'smoke_vitdanvas':
 	*clr & cla
 	menu_off = 1
-	siga_bum = 1
-	gs 'drugs','smoke'
+	gs 'drugs','smoke', 1
 	minut +=5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/vitdanvas.jpg"></center>'

locations/pornstudio.qsrc

@@ -777,7 +777,7 @@ if $ARGS[0] = 'first':
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/studio_porn/casting/casting0.jpg"></center>'
 	'You sit down on the sofa and greet the manager. "I see it''s your first time with us. So, you want to be a porn star?"'
 
-	if pcs_inhib < 40 and (money <= 500 and karta <= 500 and func('homes_properties', 'get_accessible_property_count') = 0) or (narkoman = 1 or SLomka > 0):
+	if pcs_inhib < 40 and ((money <= 500 and karta <= 500 and func('homes_properties', 'get_accessible_property_count') = 0) or (drugVars['cocaine_addict'] = 1 or drugVars['heroin_need'] > 0)):
 		'While you don''t feel confident enough showing off your body, you''re desperate for money, and are willing to do anything to earn it.'
 		act 'Continue': gt 'pornstudio', 'yes'
 	elseif pcs_inhib < 40:

locations/prostitution_pavlovsk.qsrc

@@ -113,16 +113,15 @@ if $ARGS[0] = 'search':
 		'<br>You don''t have any tissues with you to remove cum from your body.'
 	end
 
-	if joint > 0 and pro_drugs['status'] > 0 and pro_drugs['timer_pavlovsk'] ! daystart:
+	if mc_inventory['joints'] > 0 and pro_drugs['status'] > 0 and pro_drugs['timer_pavlovsk'] ! daystart:
 		act 'Take a break and smoke a joint':
 			*clr & cla
 			menu_off = 1
-			minut += 5
+			minut += 15
 			pro_drugs['timer_pavlovsk'] = daystart
+			gs 'drugs', 'joint'
 			'<center><img <<$set_imgh>> src="images/shared/drugs/joint_smoking.jpg"></center>'
 			'You head into a nearby back alley and pull a joint out of your purse and light it up. Not before long you''re starting to feel the relaxing effects as you''re getting high.'
-			gs 'drugs', 'joint'
-	        gs 'stat'
 			act 'Go back': gt 'prostitution_pavlovsk', 'search'
 		end
 	end

locations/rex_party_smallEvents.qsrc

@@ -975,9 +975,8 @@ if $ARGS[0] = 'smoke':
 	else
 		girls_smoke += 1
 		pcs_horny += 30
-		joint += 1
-		gs 'drugs', 'joint'
-		gs 'stat'
+		minut += 10
+		gs 'drugs', 'joint', 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_home_3_<<rand(2,6)>>.jpg"></center>'
 		'You pour some of the marijuana into the bowl, and fill water into the bong. Then you press a finger on the hole while using a lighter to burn the weed, drawing in smoke. After some time you begin to relax and embrace the mild euphoria.'
 		act 'Chill':

locations/saveupdater.qsrc

@@ -2619,6 +2619,77 @@ if temp_current_save_version < 00090202:
 	if motherQW['seen_dildos'] > 0 and motherKnowDildo = 0: motherKnowDildo = 1
 	if motherQW['seen_dildos'] = 0 and motherKnowDildo > 0: motherQW['seen_dildos'] = 1
 	if motherKnowRaped > 0: motherKnowSpravka = 1
+end
+
+
+!!------------------------------------!!Version 0.9.3.0!!-----------------------------------------------!!
+if temp_current_save_version < 00090300:
+	!! Drugs variable migration
+	if NarkImmune				> 0:	drugVars['cheat_immune']			= NarkImmune			& killvar 'NarkImmune'
+	if SNarkPriton				> 0:	drugVars['city_drugden']			= SNarkPriton			& killvar 'SNarkPriton'
+	if snarkozak				> 0:	drugVars['pav_dropoff']				= snarkozak				& killvar 'snarkozak'
+
+	if siga_bum					> 0:	mc_inventory['cigarettes'] 			+= 1					& killvar 'siga_bum'
+	if smoker					> 0:	drugVars['cigarettes_used']			= smoker				& killvar 'smoker'
+	if smoke_exp				> 0:	drugVars['cigarettes_exp']			= smoke_exp				& killvar 'smoke_exp'
+	if smokerneed				> 0:	drugVars['cigarettes_need']			= smokerneed			& killvar 'smokerneed'
+	if smokeDay					> 0:	drugVars['cigarettes_day']			= smokeDay				& killvar 'smokeDay'
+	if smokeHour				> 0:	drugVars['cigarettes_hour']			= smokeHour				& killvar 'smokeHour'
+	if smokeminut				> 0:	drugVars['cigarettes_minute']		= smokeminut			& killvar 'smokeminut'
+
+	if joint					< 0:	killvar 'joint'
+	if joint					> 0:	mc_inventory['joints']				= joint					& killvar 'joint'
+	if jointhigh				> 0:	drugVars['weed_high']				= jointhigh				& killvar 'jointhigh'
+	if joint_smoked 			> 0:	drugVars['weed_used']				= joint_smoked			& killvar 'joint_smoked'
+	if joint_exp				> 0:	drugVars['weed_exp']				= joint_exp				& killvar 'joint_exp'
+	if jointday					> 0:	drugVars['weed_day']				= jointday				& killvar 'jointday'
+	if jointhour				> 0:	drugVars['weed_hour']				= jointhour				& killvar 'jointhour'
+	if jointminut				> 0:	drugVars['weed_minute']				= jointminut			& killvar 'jointminut'
+
+	if SNarkTimes['inject']		> 0:	drugVars['heroin_inject']			= SNarkTimes['inject']
+	if StrongNarkota			> 0:	drugVars['heroin_high']				= StrongNarkota			& killvar 'StrongNarkota'
+	if SNarkTimes				> 0:	drugVars['heroin_used']				= SNarkTimes			& killvar 'SNarkTimes'
+	if heroin_exp				> 0:	drugVars['heroin_exp']				= heroin_exp			& killvar 'heroin_exp'
+	if SLomka					> 0:	drugVars['heroin_need']				= SLomka				& killvar 'SLomka'
+	if narkozakday				> 0:	drugVars['heroin_day']				= narkozakday			& killvar 'narkozakday'
+	if NarkShmaraTimes			> 0:	drugVars['heroin_whore']			= NarkShmaraTimes		& killvar 'NarkShmaraTimes'
+	if SNarkvnesh				> 0:	drugVars['heroin_penalty']			= SNarkvnesh			& killvar 'SNarkvnesh'
+
+	if dur						> 0:	mc_inventory['cocaine']				= dur					& killvar 'dur'
+	if nark						> 0:	drugVars['cocaine_system']			= nark					& killvar 'nark'
+	if cocaine_count			> 0:	drugVars['cocaine_used']			= cocaine_count			& killvar 'cocaine_count'
+	if cocaine_exp				> 0:	drugVars['cocaine_exp']				= cocaine_exp			& killvar 'cocaine_exp'
+	if narkday					> 0:	drugVars['cocaine_day']				= narkday				& killvar 'narkday'
+	if narkoman					> 0:	drugVars['cocaine_addict']			= narkoman				& killvar 'narkoman'
+	if willday_cocaine			> 0:	drugVars['cocaine_willday']			= willday_cocaine		& killvar 'willday_cocaine'
+
+	if amphetamine				> 0:	mc_inventory['amphetamine']			= amphetamine			& killvar 'amphetamine'
+	if amphHigh					> 0:	drugVars['amphetamine_high']		= amphHigh				& killvar 'amphHigh'
+	if amphetamine_count		> 0:	drugVars['amphetamine_used']		= amphetamine_count		& killvar 'amphetamine_count'
+	if amphetamine_exp			> 0:	drugVars['amphetamine_exp']			= amphetamine_exp		& killvar 'amphetamine_exp'
+	if amphIntake				> 0:	drugVars['amphetamine_intake']		= amphIntake			& killvar 'amphIntake'
+	if amphWithdrawl			> 0:	drugVars['amphetamine_withdrawl']	= amphWithdrawl			& killvar 'amphWithdrawl'
+	if amphetamineBonus			> 0:	drugVars['amphetamine_bonus']		= amphetamineBonus		& killvar 'amphetamineBonus'
+
+	if mentats_have				> 0:	mc_inventory['mentats']				= mentats_have			& killvar 'mentats_have'
+	if mentats_dose				> 0:	drugVars['mentats_dose']			= mentats_dose			& killvar 'mentats_dose'
+
+	if alcohol_count			> 0:	drugVars['alcohol_used']			= alcohol_count			& killvar 'alcohol_count'
+	if alcohol_exp				> 0:	drugVars['alcohol_exp']				= alcohol_exp			& killvar 'alcohol_exp'
+
+	if aphrodisiac_have			> 0:	mc_inventory['aphrodisiac']			= aphrodisiac_have		& killvar 'aphrodisiac_have'
+	if aphrodisiac_addiction	> 0:	drugVars['aphrodisiac_addict']		= aphrodisiac_addiction	& killvar 'aphrodisiac_addiction'
+	if aphrodisiac_timer		> 0:	drugVars['aphrodisiac_timer']		= aphrodisiac_timer		& killvar 'aphrodisiac_timer'
+	if aphrodisiac_overdose		> 0:	drugVars['aphrodisiac_overdose']	= aphrodisiac_overdose	& killvar 'aphrodisiac_overdose'
+	if $aphrodisiac_msg			! '':	$drugVars['aphrodisiac_msg']		= $aphrodisiac_msg		& killvar 'aphrodisiac_msg'
+
+	if steroid_have				> 0:	mc_inventory['steroids']			= steroid_have			& killvar 'steroid_have'
+	if steroid_counter			> 0:	drugVars['steroids_used']			= steroid_counter		& killvar 'steroid_counter'
+	if steroid_dose				> 0:	drugVars['steroids_dose']			= steroid_dose			& killvar 'steroid_dose'
+
+	if bcream_have				> 0:	mc_inventory['breastcream']			= bcream_have			& killvar 'bcream_have'
+	if bcream_used				> 0:	drugVars['breastcream_dose']		= bcream_used			& killvar 'bcream_used'
+
 
 end
 

locations/sex_ev_after.qsrc

@@ -1607,9 +1607,9 @@ if $ARGS[0] = 'boy_bathroom':
 			
 			if mc_inventory['cigarettes'] > 0:
 				act'Smoke to pass the time':
-					gs 'drugs', 'smoke'
-					gs'stat'
 					cla & *clr
+					gs 'drugs', 'smoke'
+
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/toilet_naked_smoke.jpg"></center>'
 					'You know this is going to take a long time so you take your smokes and a lighter into the bathroom with you.'
 					*nl
@@ -2114,16 +2114,14 @@ if $ARGS[0] = 'smoke_ciga1':
 		act'Bum a cigarette':
 			sex_ev['bum_cigarette'] = 1
 			mc_inventory['cigarettes'] += 1
-			siga_bum = 1
-			gt'sex_ev_after', 'smoke_ciga_bum'
+			gt 'sex_ev_after', 'smoke_ciga_bum'
 		end
 		
 		act'Bum a cigarette and play with your phone':
 			sex_ev['bum_cigarette'] = 1
 			sex_ev['cigarette'] = 3
 			mc_inventory['cigarettes'] += 1
-			siga_bum = 1
-			gt'sex_ev_after', 'smoke_ciga_bum'
+			gt 'sex_ev_after', 'smoke_ciga_bum'
 		end
 	end
 end

locations/sex_ev_events.qsrc

@@ -282,7 +282,7 @@ end
 if $ARGS[0] = 'offer_ciga1':
 	*nl
 	'"You want one?" he asks, holding the open packet towards you.'
-	if smoker > 20:
+	if drugVars['cigarettes_used'] > 20:
 		gs 'willpower', 'drugs', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act'Trying to quit (<<will_cost>> Willpower)':
@@ -326,7 +326,7 @@ if $ARGS[0] = 'offer_ciga1':
 		gs'sex_ev_after', 'smoke_ciga_act'
 	end
 	
-	if smoker = 0:
+	if drugVars['cigarettes_used'] = 0:
 		act'I don''t smoke':
 			cla & *clr
 			if stat['cigarettes_smoked'] > 20 and npc_caretaker[$boy] = 1:

locations/sex_ev_sex.qsrc

@@ -1289,9 +1289,8 @@ if $ARGS[0] = 'ciga_break':
 				cla & *clr
 				sex_ev['smoke_break'] = 1
 				if npc_smoker[$boy] > 0 and rand(1,20) < 20:
-					mc_inventory['cigarettes'] += 1
-					siga_bum = 1
-					gs 'drugs', 'smoke'
+					gs 'drugs', 'smoke', 1
+
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 					if sex_ev['cock_inserted'] = 0:
 						'"Got any smokes?" you ask. <<$npc_firstname[$boy]>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.'

locations/sister_chat.qsrc

@@ -43,9 +43,9 @@ if $ARGS[0] = 'checks':
 		end
 
 		!! If you are on drugs:
-		if StrongNarkota = 0 and narkossister = 1: narkossister = 0
+		if drugVars['heroin_high'] = 0 and narkossister = 1: narkossister = 0
 	
-		if StrongNarkota > 20 and narkossister = 0:
+		if drugVars['heroin_high'] > 20 and narkossister = 0:
 			if rand(1,100) >= 90:
 				dynamic $narkosisterspalila
 				exit
@@ -55,7 +55,7 @@ if $ARGS[0] = 'checks':
 		if narkossister = 1:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/reactions/worry.jpg"></center>'
-			if StrongNarkota > 20:
+			if drugVars['heroin_high'] > 20:
 				if pcs_mood > 10: pcs_mood -= 10
 				gs 'stat'
 				'You realize you''re way too high to talk to your sister right now and she would flip out if she noticed you''re high again, so you quickly move away before she notices.'

locations/stat.qsrc

@@ -95,10 +95,7 @@ end
 
 if cheatBandit = 1 and npc_horny['A66'] < 19: npc_horny['A66'] = 19
 
-if alko > 0 and frost > 0:frost = 0
-if StrongNarkota >= 20:
-    if alko > 0:alko = 0
-end
+if alko > 0 and frost > 0: frost = 0
 
 if lernSkill >= 8: gs 'exp_gain', 'intel', 1 & lernSkill = 0
 if lern >= 10: gs 'exp_gain', 'intel', 1 & lern = 0
@@ -117,12 +114,6 @@ if husband = 0:
 	houseslut = 0
 end
 
-if SNarkvnesh = 0:SNarkvnesh = 1
-
-if SNarkTimes >= SNarkvnesh * 25:
-	SNarkvnesh += 1
-	vidage += 1
-end
 if food_loc > 0 and $food_loc <> $loc: killvar 'food_loc'
 
 if gopota >= 20 and gnewQW = 1:gnewQW = 2
@@ -135,14 +126,6 @@ if pcs_vag > 36: pcs_vag = 36
 if pcs_throat > 36: pcs_throat = 36
 if pcs_ass > 36: pcs_ass = 36
 
-if NarkImmune = 1:
-	if narkoman ! 0:narkoman = 0
-elseif nark >= 30 and narkoman = 0 and NarkImmune = 0:
-	narkoman = 1
-elseif nark = 0 and narkoman = 1:
-	narkoman = 0
-end
-
 if cheatSlut = 1 or succubusflag = 1:
 	!!Succubus cannot get pregnant
 	mesec = 0
@@ -792,22 +775,13 @@ elseif rape > 0 and rape ! rape_count and orgasm > 0 and orgasm ! orgasm_count:
 	orgasm_count = orgasm
 	rape_count = rape
 end
-!! Drug stats
-if StrongNarkota <= 0:
-	if SNarkTimes >= 3 and SLomka = 0:SLomka = 1
-end
 
-if amphCount > 3 and amphHigh <= 0:
-	addictChance = rand(1,10)
-	if addictChance > 8:
-		amphWithdrawl = 2
-	end
-end
+!! Drug stats
+gs 'drugs', 'heroin', 'stat'
+gs 'drugs', 'alcohol', 'stat'
+gs 'drugs', 'cocaine', 'stat'
+gs 'drugs', 'amphetamine', 'stat'
 
-if StrongNarkota > 0:
-	if SLomka > 0:SLomka = 0
-	pcs_mood = 100
-end
 
 !!Health, Willpower, Auto Birth Control pregnancy check
 gs 'body', 'RegularUpdate'
@@ -969,21 +943,7 @@ stat['anal_strap_give'] += pegging & pegging = 0
 gs 'pain', 'calc'
 pain['relief'] = 0
 
-if alko > 9:
-	pain['relief'] = 70
-elseif alko > 6:
-	pain['relief'] = 40
-elseif alko > 3:
-	pain['relief'] = 15
-end
-
-if StrongNarkota > 0:
-	pain['relief'] = 90
-elseif nark > 0:
-	pain['relief'] = 60
-elseif pain['killer'] > 12 and alko <= 9:
-	pain['relief'] = 50
-end
+gs 'drugs', 'pain_relief'
 
 if pain['relief'] ! 0:
 	if (pain['total'] / pain['relief']) > 0:

locations/stat_display.qsrc

@@ -1460,23 +1460,23 @@ if cheatStatusIcons = 0:
 	!!Row 5: Drugs and other short term stuff
 
 	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.' , '.')
+		$stat_smoker_msg = 'You have <<mc_inventory[''cigarettes'']>> cigarette' + iif(mc_inventory['cigarettes'] = 1, '', 's') + iif(drugVars['cigarettes_need'] > 0 and drugVars['cheat_immune'] = 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 mc_inventory['cigarettes'] > 0:
+	if drugVars['cigarettes_used'] >= 20 and drugVars['cheat_immune'] = 0 and drugVars['cigarettes_need'] > 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 mc_inventory['cigarettes'] <= 0:
+	elseif drugVars['cigarettes_used'] >= 20 and drugVars['cheat_immune'] = 0 and drugVars['cigarettes_need'] > 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 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
 
-	if narkday ! daystart and narkoman = 1 and Slomka > 0:
+	if drugVars['cocaine_day'] ! daystart and drugVars['cocaine_addict'] = 1 and drugVars['heroin_need'] > 0:
 		$stat_drug_msg += 'You need heroin and cocaine.'
-	elseif narkday ! daystart and narkoman = 1 and Slomka <= 0:
+	elseif drugVars['cocaine_day'] ! daystart and drugVars['cocaine_addict'] = 1 and drugVars['heroin_need'] <= 0:
 		$stat_drug_msg += 'You need cocaine.'
-	elseif SLomka > 0:
+	elseif drugVars['heroin_need'] > 0:
 		$stat_drug_msg += 'You need heroin.'
 	else
 		$stat_drug_msg = ''
@@ -1498,9 +1498,9 @@ if cheatStatusIcons = 0:
 		end
 	end
 
-	if mentats_dose >= 1: $statusIconBarTab += '<td><a href="exec:msg ''You feel sharp and focused.''"><img title="You feel sharp and focused." height = <<set_siconht>> src="images/system/icons/status/drugs.png"></a></td>'
+	if drugVars['mentats_dose'] >= 1: $statusIconBarTab += '<td><a href="exec:msg ''You feel sharp and focused.''"><img title="You feel sharp and focused." height = <<set_siconht>> src="images/system/icons/status/drugs.png"></a></td>'
 
-	if aphrodisiac_timer > 0: $statusIconBarTab +='<td><a href="exec:msg ''You are feeling hot, and every move causes your groin to tingle.''"><img title="You are feeling hot." height = <<set_siconht>> src="images/system/icons/status/aphro_gum.png"></a></td>'
+	if drugVars['aphrodisiac_timer'] > 0: $statusIconBarTab +='<td><a href="exec:msg ''You are feeling hot, and every move causes your groin to tingle.''"><img title="You are feeling hot." height = <<set_siconht>> src="images/system/icons/status/aphro_gum.png"></a></td>'
 
 	if $stat_frost_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_frost_msg"><img title="<<$stat_frost_msg>>" height = <<set_siconht>> src="images/system/icons/status/hypothermia.png"></a></td>'
 
@@ -1508,7 +1508,7 @@ if cheatStatusIcons = 0:
 
 	if recuperation = 1: $statusIconBarTab += '<td><a href="exec:msg ''You are still recovering from major surgery.''"><img title="You are recovering from major surgery." height = <<set_siconht>> src="images/system/icons/status/health.png"></a></td>'
 
-	if bcream_used = 1: $statusIconBarTab += '<td><a href="exec:msg ''Your breasts feel hot and tingly.''"><img title="Your breasts feel hot and tingly." height = <<set_siconht>> src="images/system/icons/status/breast_cream.png"></a></td>'
+	if drugVars['breastcream_dose'] = 1: $statusIconBarTab += '<td><a href="exec:msg ''Your breasts feel hot and tingly.''"><img title="Your breasts feel hot and tingly." height = <<set_siconht>> src="images/system/icons/status/breast_cream.png"></a></td>'
 
 	if cumcondslip > 0: $statusIconBarTab += '<td><a href="exec:msg ''You feel sick, and you are wondering about the used condom you never found. Maybe those two things are related?''"><img title="You feel sick. Click to find out more." height = <<set_siconht>> src="images/system/icons/status/stuck_condom.png"></a></td>'
 
@@ -1897,9 +1897,9 @@ if enable_extra_msg = 1:
 	!!if shame > 0:$stat_msg += '<BR><<$shame>>' & $stat_msg += '<BR>'
 
 	if $pcs_mood ! '': $stat_msg += '<BR><font color="green"><b><<$pcs_mood>></b></font>'
-	if mentats_dose >= 1: $stat_msg += '<BR><font color = green>You feel sharp and focused.</font>'
-	if bcream_used = 1: $stat_msg += '<BR><font color = #DB7093>Your breasts are feeling hot and tingly.</font>'
-	if aphrodisiac_timer > 0: $stat_msg += '<BR><font color = #DB7093>You are feeling hot, and every move causes your groin to tingle.</font>'
+	if drugVars['mentats_dose'] >= 1: $stat_msg += '<BR><font color = green>You feel sharp and focused.</font>'
+	if drugVars['breastcream_dose'] = 1: $stat_msg += '<BR><font color = #DB7093>Your breasts are feeling hot and tingly.</font>'
+	if drugVars['aphrodisiac_timer'] > 0: $stat_msg += '<BR><font color = #DB7093>You are feeling hot, and every move causes your groin to tingle.</font>'
 
 	if cheatNoEat = 0 and $stat_hunger_msg ! '' and pcs_energy < 5:
 		$stat_msg += '<BR><font color="red"><b><<$stat_hunger_msg>></b></font>'
@@ -1943,8 +1943,8 @@ if enable_extra_msg = 1:
 		end
 	end
 
-	if smoker >= 20 and NarkImmune = 0:
-		if smokerNeed > 0:
+	if drugVars['cigarettes_used'] >= 20 and drugVars['cheat_immune'] = 0:
+		if drugVars['cigarettes_need'] > 0:
 			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
@@ -1961,9 +1961,9 @@ if enable_extra_msg = 1:
 		$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>'
-	if jointhour = hour and jointday = daystart and jointminut >= minut: $stat_msg += '<BR><font color="green">You are smoking a joint.</font><BR>'
-
+	if drugVars['cigarettes_day'] = daystart and drugVars['cigarettes_hour'] = hour and drugVars['cigarettes_minute'] >= minut: $stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'
+	if drugVars['weed_day'] = daystart and drugVars['weed_hour'] = hour and drugVars['weed_minute'] >= minut: $stat_msg += '<BR><font color="green">You are smoking a joint.</font><BR>'
+	
 	if cheatNoSweat = 0 and pcs_sweat > 59:
 		$stat_msg += '<br><b><font color="red"><<$stat_sweat_msg>></font></b><br>'
 	elseif cheatNoSweat = 0 and pcs_sweat > 49:
@@ -2009,8 +2009,8 @@ if enable_extra_msg = 1:
 	if Kandidoz > 30:$stat_msg += '<BR><b><font color="red">There''s a white discharge and strong smell from your vagina. You have yeast infection.</font></b>'
 
 	!!drug withdrawal
-	if SLomka > 0:$stat_msg += '<BR><b><font color="red">You are very weak and hurt to the bone. You are suffering from heroin withdrawal.</font></b>'
-	if narkday ! daystart and narkoman = 1:$stat_msg += '<BR><b><font color="red">You are very weak and hurt to the bone. You urgently need some cocaine.</font></b>'
+	if drugVars['heroin_need'] > 0:$stat_msg += '<BR><b><font color="red">You are very weak and hurt to the bone. You are suffering from heroin withdrawal.</font></b>'
+	if drugVars['cocaine_day'] ! daystart and drugVars['cocaine_addict'] = 1: $stat_msg += '<BR><b><font color="red">You are very weak and hurt to the bone. You urgently need some cocaine.</font></b>'
 
 	! WD: Bimbo look
 	if bimbolevel > 0: $stat_msg += '<BR><<$bimbostatus>>'
@@ -2091,8 +2091,8 @@ else
 	$streetev_home = 'the city center'
 end
 
-if StrongNarkota > 20 or jointhigh > 0:$stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'
-if amphHigh > 0: $stat_msg += '<BR><b><font color="red">You feel a little wired.</font></b>'
+if drugVars['heroin_high'] > 20 or drugVars['weed_high'] > 0: $stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'
+if drugVars['amphetamine_high'] > 0: $stat_msg += '<BR><b><font color="red">You feel a little wired.</font></b>'
 
 !!--------------- mid($start_type,1,2) = 'sg' Events (Start) ------------------------
 

locations/stol.qsrc

@@ -12,14 +12,14 @@ if $ARGS[0] = 'start':
 	act 'Get up': gt $loc, $loc_arg
 	act 'Check your birth control': gt 'stol', 'bc'
 
-	if mentats_have > 0:
-		'<a href="exec:gs ''drugs'', ''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.'
+	if mc_inventory['mentats'] > 0:
+		'<a href="exec:gs ''drugs'', ''mentats'' & gt ''stol'', ''start''"><b>Take neurobooster pill.</b></a> Uses left: <<mc_inventory[''mentats'']>>. Warning on the box says not to take more than one per day.'
 	end
-	if steroid_have > 0:
-		'<a href="exec:gs ''drugs'', ''steroids'' & gt ''stol'', ''start''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
+	if mc_inventory['steroids'] > 0:
+		'<a href="exec:gs ''drugs'', ''steroids'' & gt ''stol'', ''start''"><b>Take steroids.</b></a> Uses left: <<mc_inventory[''steroids'']>>.'
 	end
-	if aphrodisiac_have > 0:
-		'<a href="exec:gs ''drugs'', ''aphrodisiac'' & gt ''stol'', ''start''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
+	if mc_inventory['aphrodisiac'] > 0:
+		'<a href="exec:gs ''drugs'', ''aphrodisiac'' & gt ''stol'', ''start''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<mc_inventory[''aphrodisiac'']>>.'
 	end
 
 	killvar '$stol_loc_temp'
@@ -311,16 +311,16 @@ if $ARGS[0] = 'studying_exam':
 		study_mod -= 20
 		'You are feeling a little tipsy and the you think that the studying is going great. But when you afterwards look at it you notice that a lot of your notes you made makes no sense.'
 	end
-	if mentats_dose >= 1: study_mod += 30
+	if drugVars['mentats_dose'] >= 1: study_mod += 30
 	If pcs_mood < 50:
 		study_mod -= 20
 		'you are in a bad mood and it clearly effects you studying.'
 	end
-	if StrongNarkota > 0 or jointhigh > 0:
+	if drugVars['heroin_high'] > 0 or drugVars['weed_high'] > 0:
 		study_mod -= 40
 		'You are stoned, and it is not making it easier to concentrate on studying.'
 	end
-	if amphHigh > 0: study_mod += 20
+	if drugVars['amphetamine_high'] > 0: study_mod += 20
 	if pcs_energy < 5:
 		study_mod -= 20
 		'You are extremely hungry and it it is hard thinking about anything else that food.'

locations/swamphouse.qsrc

@@ -876,7 +876,6 @@ if $ARGS[0] = 'hunterstable':
 		act 'Drink vodka (0:15)':
 			*clr & cla
 			gs 'drugs', 'alcohol', 'vodka', 1
-			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka'+rand(0,2)+'.jpg"></center>'
 			*nl
@@ -887,7 +886,6 @@ if $ARGS[0] = 'hunterstable':
 		act 'Drink beer (0:15)':
 			*clr & cla
 			gs 'drugs', 'alcohol', 'beer', 1
-			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/beer2.jpg"></center>'
 			*nl
@@ -935,16 +933,11 @@ if $ARGS[0] = 'hunterstable':
 				act 'Agree':
 					*clr & cla
 					minut += 15
-					smoker += 1
-					smokeHour = hour
-					smokeDay = day
-					smokeminut = minut+5
-					smokeNeed = 0
-					pcs_mood += 100
-					if huntersKnowSlut = 0:huntersAndreiQw += 1
-					if huntersKnowSlut = 0:huntersIgorQw += 1
-					if huntersKnowSlut = 0:huntersSergeiQw += 1
-					gs 'stat'
+
+					if huntersKnowSlut = 0: huntersAndreiQw += 1
+					if huntersKnowSlut = 0: huntersIgorQw += 1
+					if huntersKnowSlut = 0: huntersSergeiQw += 1
+					gs 'drugs', 'smoke', 1
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 					*nl
@@ -965,14 +958,8 @@ if $ARGS[0] = 'hunterstable':
 					act 'Agree':
 						*clr & cla
 						minut += 15
-						smoker += 1
-						smokeHour = hour
-						smokeDay = day
-						smokeminut = minut+5
-						smokeNeed = 0
-						pcs_mood += 100
 						huntersAndreiQw += 1
-						gs 'stat'
+						gs 'drugs', 'smoke', 1
 
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 						*nl
@@ -986,14 +973,8 @@ if $ARGS[0] = 'hunterstable':
 						act 'Agree':
 							*clr & cla
 							minut += 15
-							smoker += 1
-							smokeHour = hour
-							smokeDay = day
-							smokeminut = minut+5
-							smokeNeed = 0
-							pcs_mood += 100
 							huntersAndreiQw += 1
-							gs 'stat'
+							gs 'drugs', 'smoke', 1
 
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big172.jpg"></center>'
 							*nl
@@ -1101,20 +1082,13 @@ if $ARGS[0] = 'hunterstable':
 				act 'Agree':
 					*clr & cla
 					minut += 15
-					smoker += 1
-					smokeHour = hour
-					smokeDay = day
-					smokeminut = minut+5
-					smokeNeed = 0
-					pcs_mood += 100
 					if huntersKnowSlut = 0:huntersSergeiQw += 1
-					gs 'stat'
+					gs 'drugs', 'smoke', 1
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 					*nl
 					'You follow Sergei outside. He gives you a cigarette, and the two of you continue with your conversation.'
 
-
 					act 'Return to the table': gs 'swamphouse', 'hunterstable'
 				end
 				act 'Refuse': gs 'swamphouse', 'hunterstable'
@@ -1129,14 +1103,8 @@ if $ARGS[0] = 'hunterstable':
 				act 'Agree':
 					*clr & cla
 					minut += 15
-					smoker += 1
-					smokeHour = hour
-					smokeDay = day
-					smokeminut = minut+5
-					smokeNeed = 0
-					pcs_mood += 100
 					if huntersKnowSlut = 0:huntersIgorQw += 1
-					gs 'stat'
+					gs 'drugs', 'smoke', 1
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 					*nl

locations/train_events.qsrc

@@ -545,7 +545,7 @@ if $ARGS[0] = 'weed':
 		act 'Smoke with him':
 			*clr & cla
 			pcs_horny = 100
-			gs 'stat'
+			gs 'drugs', 'joint', 1
 			'<center><h4>Pavlovsk Station</h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weedsmoke.jpg" ></center>'
 			'You smile and nod, taking the joint from him - you only live once and it''s as good a pastime as any. He lights it as you take a long slow drag off it and hold it in, feeling it in your lungs... until you start coughing, causing him to chuckle. You feel the relaxing effect almost at once, your head feeling both lighter and heavier, your mind slowing down... but you notice a slightly odd taste to the smoke that you can''t place - maybe that''s just what this variety tastes like. You pass it back and forth with him, chatting idly as you smoke, and as you do, you start to feel aroused: Your nipples harden, your pussy gets soaking wet and you feel so wound up that you have to actively keep your hands in check to prevent yourself from masturbating out in the open.'

locations/traits.qsrc

@@ -313,7 +313,7 @@ end
 if $ARGS[0] = 'addictive_personality':
 	!!Addictive Personality Trait
 	if addictive_cheat = 0:
-		addictive_exp = smoke_exp + joint_exp + heroin_exp + cocaine_exp + alcohol_exp + amphetamine_exp
+		addictive_exp = drugVars['cigarettes_exp'] + drugVars['weed_exp'] + drugVars['heroin_exp'] + drugVars['cocaine_exp'] + drugVars['alcohol_exp'] + drugVars['amphetamine_exp']
 
 		if addictive_exp = 2 and addictive_trait_lvl < 1:
 			addictive_trait_lvl = 1
@@ -321,7 +321,7 @@ if $ARGS[0] = 'addictive_personality':
 		elseif addictive_exp = 3 and addictive_trait_lvl < 2:
 			addictive_trait_lvl = 2
 			if add_trait_msg_2 = 0: add_trait_msg_2 = 1 & msg 'You have increased the level of your ''Addictive Personality'' trait to 2.'
-		elseif addictive_exp >= 4 or (heroin_exp = 1 and cocaine_exp = 1) and addictive_trait_lvl < 3:
+		elseif addictive_exp >= 4 or (drugVars['heroin_exp'] = 1 and drugVars['cocaine_exp'] = 1) and addictive_trait_lvl < 3:
 			addictive_trait_lvl = 3
 			if add_trait_msg_3 = 0: add_trait_msg_3 = 1 & msg 'You have increased the level of your ''Addictive Personality'' trait to 3.'
 		end

locations/uni_admin.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'take_prep':
 	cla & *clr
 	minut += 60
 	university['prep_counter'] += 1
-	gs 'exp_gain', 'intel', 1 + (mentats_dose - rand(0,mentats_dose))
+	gs 'exp_gain', 'intel', 1 + rand(0, drugVars['mentats_dose'])
 	gs 'stat'
 	'<center><b><font color="maroon">Preparatory Class</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/prepcourse1.jpg"></center>'
@@ -389,7 +389,7 @@ if $ARGS[0] = 'take_test':
 	$sexloc = 'uni_admin'
 	cla & *clr
 	minut += 60
-	gs 'exp_gain', 'intel', 1 + (mentats_dose - rand(0,mentats_dose))
+	gs 'exp_gain', 'intel', 1 + rand(0, drugVars['mentats_dose'])
 	gs 'stat'
 	'<center><b><font color="maroon">Entrance Exam</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/prepcourse1.jpg"></center>'

locations/uni_library.qsrc

@@ -188,16 +188,16 @@ if $ARGS[0] = 'studying_exam':
 		study_mod -= 20
 		'You''re feeling a little tipsy, but feel like your studying is going great. However, when you look at your notes afterwards, you notice that a lot of them make no sense.'
 	end
-	if mentats_dose >= 1: study_mod += 30
+	if drugVars['mentats_dose'] >= 1: study_mod += 30
 	If pcs_mood < 50:
 		study_mod -= 20
 		'You''re in a bad mood and it clearly affects your studying.'
 	end
-	if StrongNarkota > 0 or jointhigh > 0:
+	if drugVars['heroin_high'] > 0 or drugVars['weed_high'] > 0:
 		study_mod -= 40
 		'You''re stoned, which makes it hard to concentrate on studying.'
 	end
-	if amphHigh > 0: study_mod += 20
+	if drugVars['amphetamine_high'] > 0: study_mod += 20
 	if pcs_energy < 5:
 		study_mod -= 20
 		'You''re extremely hungry and it''s hard to think about anything other than food.'
@@ -343,7 +343,7 @@ if $ARGS[0] = 'read':
 	cla
 	act 'Read a book on science (1:00)':
 		dynamic $downlibrary['read']
-		gs 'exp_gain', 'intel', rand(3,6) + (mentats_dose - rand(0,mentats_dose))
+		gs 'exp_gain', 'intel', rand(3,6) + rand(0, drugVars['mentats_dose'])
 		grupvalue[3] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/science1.jpg"></center>'

locations/vasilyhome.qsrc

@@ -941,7 +941,7 @@ if $ARGS[0] = 'vasily_lern':
 	if lernHome > 0:
 		minut += 60
 		lern += rand(1,6)
-		gs 'exp_gain', 'intel', rand(1,2) + (mentats_dose - rand(0,mentats_dose))
+		gs 'exp_gain', 'intel', rand(1,2) + rand(0, drugVars['mentats_dose'])
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/sex/shuglinhome/lern/ev<<lern_imgset>>.jpg"></center>'
 		'You sit with Vasily for an hour and do your homework.'

locations/willpower.qsrc

@@ -786,18 +786,18 @@ if $ARGS[0] = 'drink':
 	gs 'willpower', 'calc'
 	
 	if $ARGS[1] = 'self':
-		will_cost = (60 - alcohol_exp * 40 + will_calc)/10
+		will_cost = (60 - drugVars['alcohol_exp'] * 40 + will_calc)/10
 	elseif $ARGS[1] = 'force':
-		will_cost = (100 - will_enforced - alcohol_exp * 30 + will_calc)/10
+		will_cost = (100 - will_enforced - drugVars['alcohol_exp'] * 30 + will_calc)/10
 	else
 		if alko > 10:
-			will_cost = (20 + alcohol_exp * 10 + will_calc)/10
+			will_cost = (20 + drugVars['alcohol_exp'] * 10 + will_calc)/10
 		elseif alko > 6:
-			will_cost = (80 + alcohol_exp * 40 + will_calc)/10
+			will_cost = (80 + drugVars['alcohol_exp'] * 40 + will_calc)/10
 		elseif alko > 3:
-			will_cost = (60 + alcohol_exp * 30 + will_calc)/10
+			will_cost = (60 + drugVars['alcohol_exp'] * 30 + will_calc)/10
 		else
-			will_cost = (10 + alcohol_exp * 20 + will_calc)/10
+			will_cost = (10 + drugVars['alcohol_exp'] * 20 + will_calc)/10
 		end
 	end
 	gs 'willpower', 'difficulty', $ARGS[1], $ARGS[2]
@@ -890,25 +890,25 @@ if $ARGS[0] = 'dnd':
 	end
 
 	!!cigarettes
-	if smokerNeed > 10: will_dnd += 10
+	if drugVars['cigarettes_need'] > 10: will_dnd += 10
 	!!weed
-	if jointhigh > 0: will_dnd -= 10
+	if drugVars['weed_high'] > 0: will_dnd -= 10
 	!!amphetamines
-	if amphWithdrawl > 2:
+	if drugVars['amphetamine_withdrawl'] > 2:
 		will_dnd += 40
-	elseif amphHigh > 0:
+	elseif drugVars['amphetamine_high'] > 0:
 		will_dnd += 80
 	end
 	!!heroine
-	if SLomka > 0:
+	if drugVars['heroin_need'] > 0:
 		will_dnd += 100
-	elseif StrongNarkota > 0:
+	elseif drugVars['heroin_high'] > 0:
 		will_dnd += 60
 	end
 	!!cocaine
-	if narkoman = 1:
+	if drugVars['cocaine_addict'] = 1:
 		will_dnd += 60
-	elseif nark < 0:
+	elseif drugVars['cocaine_system'] < 0:
 		will_dnd -= 20
 	end
 end