glife.qproj

@@ -85,6 +85,7 @@
 	<Folder name="Sleep">
 		<Location name="pre_sleep"/>
 		<Location name="pre_sleep_events"/>
+		<Location name="sleep_reflections"/>
 		<Location name="dream_events"/>
 		<Location name="sleep"/>
 		<Location name="sleep_simple"/>
@@ -387,7 +388,6 @@
 		<Location name="bdsm_dressing"/>
 		<Location name="bdsm_landing"/>
 		<Location name="bdsm_dining"/>
-		<Location name="bdsm_library"/>
 		<Location name="bdsm_ballroom"/>
 		<Location name="bdsm_garden"/>
 		<Location name="bdsm_conservatory"/>
@@ -396,7 +396,6 @@
 		<Location name="bdsm_bedwest"/>
 		<Location name="bdsm_bedeast"/>
 		<Location name="bdsm_gameroom"/>
-		<Location name="bdsm_livingroom"/>
 		<Location name="bdsm_bathrooms"/>
 	</Folder>
 	<Folder name="Trade Representative">

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>'
@@ -850,7 +851,7 @@ $cheatmenu['looks'] = {
 	'<a href="exec:dynamic $cheatmenu[''visualage'']">Change apparent age</a>'
 	*nl
 	'You are <<pcs_hgt>> centimetres tall'
-	'<a href="exec:pcs_hgt = input(''Enter <<$pcs_nickname>>s height in centimetres<br><br>(default 170, min 100, max 200, values below 160 and above 180 will cause problems in the calculation of BMI/weight the more you deviate from the default 170)'') & dynamic $cheatmenu[''looks'']">Change <<$pcs_nickname>>''s height</a>'
+	'<a href="exec:pcs_hgt = input(''Enter <<$pcs_nickname>>s height in centimetres<br><br>(default 165, min 100, max 200, values below 150 and above 180 will cause problems in the calculation of BMI/weight the more you deviate from the default 170)'') & dynamic $cheatmenu[''looks'']">Change <<$pcs_nickname>>''s height</a>'
 	*nl
 	*p 'Musculature (<<stren_plus_lvl>>): ' & dynamic $cheatmenu['printLooksLinks'], 'stren_plus', 'Musculature'
 	*pl '<font color="grey">Allows strength to go past 100'
@@ -859,26 +860,31 @@ $cheatmenu['looks'] = {
 	*p 'Toned Butt (<<butt_tr_lvl>>): ' & dynamic $cheatmenu['printLooksLinks'], 'butt_tr', 'Toned Butt'
 	*nl
 	'You have <<$titsize>> breasts'
-	if tits => 0 and tits < 11:'<a href="exec: bodyVars[''bust_silicone''] += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
-	if bodyVars['bust_silicone'] => 1:'<a href="exec: bodyVars[''bust_silicone''] -= 5 & dynamic $cheatmenu[''looks'']">Shrink breasts(silicone)</a>'
-	if tits => 0 and tits < 11:'<a href="exec: pcs_mass[''bust''] += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(natural)</a>'
-	if pcs_mass['bust'] => 1: '<a href="exec: pcs_mass[''bust''] -= 5 & titreduc = 1 & dynamic $cheatmenu[''looks'']">Shrink breasts(natural)</a>'
+	if tits < 11:'<a href="exec: bodyVars[''bust_silicone''] += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
+	if bodyVars['bust_silicone'] => 1:'<a href="exec: bodyVars[''bust_silicone''] = min(0, bodyVars[''bust_silicone'']-5) & dynamic $cheatmenu[''looks'']">Shrink breasts(silicone)</a>'
+	if tits < 11:'<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', 5">Enlarge breasts (natural)</a>'
+	if pcs_mass['bust'] => 6: '<a href="exec: titreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', -5">Shrink breasts (natural)</a>'
 	*nl
-	if pcs_butt <= 4:
+	if pcs_butt <= 14:
 		$pcs_butt[1] = 'flat'
-	elseif pcs_butt <= 8:
+	elseif pcs_butt <= 25:
 		$pcs_butt[1] = 'average'
-	elseif pcs_butt <= 12:
+	elseif pcs_butt <= 40:
 		$pcs_butt[1] = 'pert'
+	elseif pcs_butt <= 59:
+		$pcs_butt[1] = 'heart-shaped'
 	else
 		$pcs_butt[1] = 'bubble'
 	end
-	'You have <<$pcs_butt[1]>> butt'
-	if pcs_butt < 20:'<a href="exec: bodyVars[''butt_cheat''] += 2 & dynamic $cheatmenu[''looks'']">Enlarge butt</a>'
-	if pcs_butt > 1:'<a href="exec: bodyVars[''butt_cheat''] -= 2 & dynamic $cheatmenu[''looks'']">Shrink butt</a>'
-	if bodyVars['butt_cheat'] ! 0:'<a href="exec: bodyVars[''butt_cheat''] = 0 & dynamic $cheatmenu[''looks'']">Reset butt shape to default</a>'
-	if bodyVars['butt_silicone'] => 1:'<a href="exec: bodyVars[''butt_silicone''] = 0 & dynamic $cheatmenu[''looks'']">Remove butt implants</a>'
-	if bodyVars['butt_silicone'] = 0:'<a href="exec: bodyVars[''butt_silicone''] += 16 & dynamic $cheatmenu[''looks'']">Add butt implants</a>'
+	'You have a <<$pcs_butt[1]>> butt'
+	if pcs_butt < 60: '<a href="exec: bodyVars[''butt_silicone''] += 10 & dynamic $cheatmenu[''looks'']">Enlarge butt (silicone)</a>'
+	if bodyVars['butt_silicone'] => 1: '<a href="exec: bodyVars[''butt_silicone''] = max(0, bodyVars[''butt_silicone'']-10) & dynamic $cheatmenu[''looks'']">Shrink butt (silicone)</a>'
+	if pcs_butt < 60: '<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', 10">Enlarge butt (natural)</a>'
+	if pcs_mass['butt'] => 6: '<a href="exec: assreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', -10">Shrink butt (natural)</a>'
+
+!	if pcs_butt < 20:'<a href="exec: bodyVars[''butt_cheat''] += 2 & dynamic $cheatmenu[''looks'']">Enlarge butt</a>'
+!	if pcs_butt > 1:'<a href="exec: bodyVars[''butt_cheat''] -= 2 & dynamic $cheatmenu[''looks'']">Shrink butt</a>'
+!	if bodyVars['butt_cheat'] ! 0:'<a href="exec: bodyVars[''butt_cheat''] = 0 & dynamic $cheatmenu[''looks'']">Reset butt shape to default</a>'
 	*nl
 	'<<$lip>>'
 	if pcs_lip < 4:'<a href="exec:pcs_lip += 1 & dynamic $cheatmenu[''looks'']">Enlarge lips</a>'
@@ -928,7 +934,7 @@ $cheatmenu['looks'] = {
 	if dounspell = 0:
 		if fat ! 0: '<a href="exec:fat = 0 & dynamic $cheatmenu[''looks'']">Zero fat</a>'
 		'Body Fat = (<<pcs_mass[''body'']>>): <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', -10">-10</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', -5">-5</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', -1">-1</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', 1">+1</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', 5">+5</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', 10">+10</a>'
-		'Note: You need some Body Fat to survive, any value under 11 is clasified as "starving" and a value of 0 can lead to a Game Over. 60 is the center of a healthy bodyweight.'
+		'Note: You need some Body Fat to survive, any value under 11 is clasified as "starving" and a value of 0 can lead to a Game Over. <<func(''body'', ''CalcOptBodyMass'')>> gives a bmi of 22.5.'
 	end
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''tatoo'']">Tattoo removal</a>'
@@ -977,9 +983,27 @@ $cheatmenu['looks'] = {
 
 if $ARGS[0] = 'change_pcs_mass_body':
 	gs 'body', 'Set_mass_distribution_using_body', pcs_mass['body'] + ARGS[1]
+	pcs_mass['body_message'] = pcs_mass['body']
 	dynamic $cheatmenu['looks']
 end
 
+if $ARGS[0] = 'change_pcs_mass_bust':
+	pcs_mass['bust'] += ARGS[1]
+	pcs_mass['bust_gen'] += ARGS[1]
+	if pcs_mass['bust'] < 2: pcs_mass['bust'] = 2
+	if pcs_mass['bust_gen'] < 2: pcs_mass['bust_gen'] = 2
+	pcs_mass['bust_message'] = pcs_mass['bust']
+	dynamic $cheatmenu['looks']
+end
+
+if $ARGS[0] = 'change_pcs_mass_butt':
+	pcs_mass['butt'] += ARGS[1]
+	pcs_mass['butt_gen'] += ARGS[1]
+	if pcs_mass['butt'] < 2: pcs_mass['butt'] = 2
+	if pcs_mass['butt_gen'] < 2: pcs_mass['butt_gen'] = 2
+	pcs_mass['butt_message'] = pcs_mass['butt']
+	dynamic $cheatmenu['looks']
+end
 
 if $ARGS[0] = 'vagenlarge':
 	if pcs_vag = 0:
@@ -3177,14 +3201,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'']>>'
@@ -3787,13 +3811,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/Cum_Manage.qsrc

@@ -955,11 +955,11 @@ if $ARGS[0] = 'cum_stat_display':
 			end
 		if j < 7: j+=1 & jump 'ageloop'
 
-		if stat_cumloc_check = 1 and cheatKlisma = 1 and (FUNC('Cum_Manage', 'check_private', i) = 0 _ 
+		if stat_cumloc_check = 1 and (FUNC('Cum_Manage', 'check_private', i) = 0 _ 
 		or (i <> 0 and cumsumass = 0 and cumsumvag > 0 and FUNC('Cum_Manage', 'check_innards', 0) = 0) _ 
 		or (i <> 3 and cumsumvag = 0 and cumsumass > 0 and FUNC('Cum_Manage', 'check_innards', 3) = 0) _ 
 		or (i > 3 and cumsumvag > 0 and FUNC('Cum_Manage', 'check_innards', 0) = 0 and cumsumass > 0 and FUNC('Cum_Manage', 'check_innards', 3) = 0)):
-			stat_cumloc_check = 0
+			stat_cumloc_check = 2
 		end
 
 	if i < 18: i+=1 & jump 'cumlocloop'

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/_attributes_danilovich_panties.qsrc

@@ -46,7 +46,7 @@ elseif ARGS[1] = 6:
 elseif ARGS[1] = 7:
 	PanType = 1
 	PanFun = 2
-	PanQuality = 2
+	PanQuality = 3
 	PanThinness = 2
 	underwear['pair'] = 7
 

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/albina_house_events.qsrc

@@ -1265,6 +1265,7 @@ if $ARGS[0] = 'study_door':
 			'You find yourself in a modern, lavishly decorated study. You take a quick look around, but find nothing of any real interest to you. This was clearly her father''s study. No wonder Albina hates coming in here. Just as you''re about to leave, you accidently knock one of the heavy books off the shelf, gritting your teeth in pain when it lands on your foot. Thankfully, nobody seems to have heard and you kneel down to pick it back up. As you do, something falls out from between the pages. Placing the book back, you glance down and see a flash drive at your feet.' 
 			'You pick it up and pocket it, curious about why someone would hide it. You just need a computer to access it.' 
 			'With nothing else to see, you quickly duck back out of the study, being careful to leave the door in its original ajar position before heading to Albina''s bedroom.'
+			AlbinaQW['flashdrive'] = 1
 			act 'Continue': gt 'albinahome', 'bedroom'
 		end
 	end

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/anushkachat_city.qsrc

@@ -308,6 +308,7 @@ if $ARGS[0] = 'chat':
 				'"I''m not sure, but I guess I have a few options," you tell her.'
 				'She nods. "Well, you should decide before you get stuck in this crappy little town married to some asshole whose kids you''re popping out every few years. Not judging you, unless that''s what you want. I''m just saying..."'
 				'You''re not sure what more to say about it, so you decide to change the subject.'
+			end
 			act 'Stop talking': gt 'anush_bedroom_city','anushroom'
 			act 'Keep talking': gt 'anushkachat_city', 'chat'
 		end

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/bdsm_ballroom.qsrc

@@ -11,8 +11,8 @@ if $ARGS[0] = 'ballroom':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/ballroom.jpg"></center>'
 	'Ballroom'
-	act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
-	act 'Go to the atrium': gt 'bdsm_ballroom', 'atrium'
+	act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
+	act 'Go to the Atrium': gt 'bdsm_ballroom', 'atrium'
 end
 
 

locations/bdsm_basement.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/basement.jpg"></center>'
 		'Basement, for torture and whatnot'
 
-		act 'Go upstairs to the east wing hallway': killvar 'bdsm_basement_rand' & gt 'bdsm_hallway', 'east'
+		act 'Go upstairs': killvar 'bdsm_basement_rand' & gt 'bdsm_hallway', 'foyer'
 	end
 end
 

locations/bdsm_bathrooms.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'bath':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bath1.jpg"></center>'
 	'A luxrious bathroom, designed to indulge and relax.'
 	gs 'din_van', 'private'
-	act 'Return to east wing landing':gt'bdsm_landing', 'east'
+	act 'Return to landing':gt'bdsm_landing'
 end
 
 if $ARGS[0] = 'ensuite':

locations/bdsm_bedeast.qsrc

@@ -1,18 +1,22 @@
 # bdsm_bedeast
 
-if $ARGS[0] = 'guestB':
+if $ARGS[0] = 'start':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'bdsm_bedeast'
-	$loc_arg = 'guestB'
+	$loc_arg = 'start'
 	$menu_loc = 'bdsm_bedeast'
-	$menu_arg = 'guestB'
+	$menu_arg = 'start'
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedb.jpg"></center>'
-	'Guest bedroom B'
-	act 'Go to the east wing landing': gt 'bdsm_landing', 'east'
+	'Guest bedroom 2'
+	act 'Go to the landing': gt 'bdsm_landing'
+	gs 'bdsm_bedeast', 'events'
+end
+
+if $ARGS[0] = 'events':
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -23,7 +27,7 @@ if $ARGS[0] = 'guestB':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 	
-		act 'Return':gt 'bdsm_bedeast', 'guestB'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -34,7 +38,7 @@ if $ARGS[0] = 'guestB':
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestB'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -45,8 +49,8 @@ if $ARGS[0] = 'guestB':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestB'
-		if bdsmclub['role'] = 'sub':
+		act 'Return':gt 'bdsm_bedeast', 'start'
+		if $bdsmclub['role'] = 'sub':
 			act 'Join them':
 				*clr & cla
 				gs 'npcgeneratec', 0, 'Dominant man from the Club', rand(18,45)
@@ -61,26 +65,10 @@ if $ARGS[0] = 'guestB':
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Return':gt 'bdsm_bedeast', 'guestB'
+				act 'Return':gt 'bdsm_bedeast', 'start'
 			end
 		end
-	end
-end
-
-if $ARGS[0] = 'guestC':
-    $location_type = 'private'
-	$locclass = 'bedr'
-	$loc = 'bdsm_bedeast'
-	$loc_arg = 'guestC'
-	$menu_loc = 'bdsm_bedeast'
-	$menu_arg = 'guestC'
-	menu_off = 0
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedc.jpg"></center>'
-	'Guest bedroom C'
-	act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
-	if rand (0,100) < 3:
+	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
 		gs 'stat'
@@ -90,8 +78,8 @@ if $ARGS[0] = 'guestC':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestC'
-		if bdsmclub['role'] = 'sub':
+		act 'Return':gt 'bdsm_bedeast', 'start'
+		if $bdsmclub['role'] = 'sub':
 			act 'Join them':
 				*clr & cla
 				gs 'stat'
@@ -105,7 +93,7 @@ if $ARGS[0] = 'guestC':
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Return':gt 'bdsm_bedeast', 'guestC'
+				act 'Return':gt 'bdsm_bedeast', 'start'
 			end
 		end
 	elseif rand (0,100) < 3:
@@ -119,7 +107,7 @@ if $ARGS[0] = 'guestC':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestC'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -131,24 +119,8 @@ if $ARGS[0] = 'guestC':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestC'
-	end
-end
-
-if $ARGS[0] = 'guestD':
-    $location_type = 'private'
-	$locclass = 'bedr'
-	$loc = 'bdsm_bedeast'
-	$loc_arg = 'guestD'
-	$menu_loc = 'bdsm_bedeast'
-	$menu_arg = 'guestD'
-	menu_off = 0
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedd.jpg"></center>'
-	'Guest bedroom D'
-	act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
-	if rand (0,100) < 3:
+		act 'Return':gt 'bdsm_bedeast', 'start'
+	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
 		gs 'stat'
@@ -158,7 +130,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -169,8 +141,8 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestD'
-		if bdsmclub['role'] = 'sub':
+		act 'Return':gt 'bdsm_bedeast', 'start'
+		if $bdsmclub['role'] = 'sub':
 			act 'Watch':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/bedrand6.mp4"></video></center>'
@@ -191,7 +163,7 @@ if $ARGS[0] = 'guestD':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Return':gt 'bdsm_bedeast', 'guestD'
+					act 'Return':gt 'bdsm_bedeast', 'start'
 				end
 			end
 		end
@@ -206,7 +178,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -218,7 +190,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	end
 end
 

locations/bdsm_bedwest.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'master':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/masterbed.jpg"></center>'
 	'Master bedroom'
-	act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
+	act 'Go to the landing':gt 'bdsm_landing'
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -50,7 +50,7 @@ if $ARGS[0] = 'master':
 		gs 'stat'
 		
 		act 'Return':gt 'bdsm_bedwest', 'master'
-	elseif rand (0,100) < 3 and bdsmclub['role'] = 'sub':
+	elseif rand (0,100) < 3 and $bdsmclub['role'] = 'sub':
 		menu_off = 1
 		*clr & cla
 		pcs_horny += 5
@@ -77,8 +77,8 @@ if $ARGS[0] = 'guest':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/beda.jpg"></center>'
-	'Guest bedroom A'
-	act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
+	'Guest bedroom'
+	act 'Go to the landing':gt 'bdsm_landing'
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla

locations/bdsm_conservatory.qsrc

@@ -11,8 +11,8 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/conservatory.jpg"></center>'
 'This huge glass fronted room is kept very warm and houses a number of rare and exotic plants.'
 'It is one of the few places where you can just relax and enjoy the opulence of the mansion.'
-act 'Go to the garden': gt 'bdsm_garden', 'garden'
-act 'Go to east wing hall': gt 'bdsm_hallway', 'east'
+act 'Go to the Garden': gt 'bdsm_garden', 'garden'
+act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
 
 --- bdsm_conservatory ---------------------------------
 

locations/bdsm_dining.qsrc

@@ -9,8 +9,7 @@ menu_off = 0
 cls
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/diningroom.jpg"></center>'
-act 'Go to foyer': gt 'bdsm_hallway', 'foyer'
-act 'Go to the east wing hallway':gt 'bdsm_hallway', 'east'
+act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
 
 if rand (0,100) < 3:
 	menu_off = 1

locations/bdsm_dressing.qsrc

@@ -9,7 +9,7 @@ $loc_arg = ''
 $menu_loc = 'bdsm_dressing'
 $menu_arg = ''
 !! Role cleared here and set when re-entering to allow for sub and dom usage
-bdsmclub['role'] = ''
+$bdsmclub['role'] = ''
 menu_off = 0
 cls
 gs 'stat'
@@ -22,15 +22,15 @@ gs 'stat'
 'Submissives must wear either maid or submissive sex shop clothing or be naked.'
 'Dominants must wear clothing of minimum "expensive" quality.'
 if ($clothingworntype = 'gm_maid' or PCloStyle2 = 1) or CloStyle3 = 2 or $clothingworntype = 'nude':
-	act 'Enter the club''s east wing hall (submissive role)':
-		bdsmclub['role'] = 'sub'
-		gt 'bdsm_hallway', 'east'
+	act 'Enter the club''s foyer (submissive role)':
+		$bdsmclub['role'] = 'sub'
+		gt 'bdsm_hallway', 'foyer'
 	end
 end
 if PCloQuality >= 5 and bdsmclub['payday'] + 30 > daystart and bdsmclub['domtraining'] = 2:
-	act 'Enter the club''s east wing hall (dominant role)':
-		bdsmclub['role'] = 'dom'
-		gt 'bdsm_hallway', 'east'
+	act 'Enter the club''s foyer (dominant role)':
+		$bdsmclub['role'] = 'dom'
+		gt 'bdsm_hallway', 'foyer'
 	end
 end
 
@@ -39,7 +39,8 @@ if bdsmclub['payday'] + 30 <= daystart:
 	'You do not have a paid subscription so you cannot enter the club as a dominant, you can go direct to the office and pay from here.'
 	act 'Go to office and pay subscription': gt 'bdsm_mansion', 'office'
 end
-act 'Return to the foyer': gt 'bdsm_hallway', 'foyer'
+
+act 'Go to the Foyer (no role set)': gt 'bdsm_hallway', 'foyer'
 act 'Leave the club':gt 'city_suburbs', 'start'
 
 --- bdsm_dressing ---------------------------------

locations/bdsm_gameroom.qsrc

@@ -8,7 +8,7 @@ $menu_arg = ''
 menu_off = 0
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/games.jpg"></center>'
 'Games room'
-act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
+act 'Go to the landing':gt 'bdsm_landing'
 
 if rand (0,100) < 3:
 	menu_off = 1

locations/bdsm_garden.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'garden':
 	act 'Go to the conservatory': gt 'bdsm_conservatory'
 	act 'Go to the garage': gt 'bdsm_garden', 'garage'
 
-	if bdsmclub['role'] = 'sub' and rand (0, 100) < 5 and stat['think_virgin'] = 0:
+	if $bdsmclub['role'] = 'sub' and rand (0, 100) < 5 and stat['think_virgin'] = 0:
 		gt 'bdsm_garden', 'gEV1'
 	elseif rand (0,100) < 3:
 		menu_off = 1

locations/bdsm_hallway.qsrc

@@ -1,6 +1,8 @@
 # bdsm_hallway
 
 CLOSE ALL
+
+
 if $ARGS[0] = 'foyer':
     $location_type = 'private'
 	$loc = 'bdsm_hallway'
@@ -13,67 +15,24 @@ if $ARGS[0] = 'foyer':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/foyer.jpg"></center>'
 	'You stand in the grand foyer, your eye is draw towards and up the dual staircases. To your left is the Dinning room, to your right the dressing room.'
 	'Discreetly to the sides of the staircases are two rest rooms.'
-	act 'Leave the club':
-		if $clothingworntype ! 'nude':
-			gt 'city_suburbs', 'start'
-		else
-			msg'<b><font color = red>You need to get dressed.</font></b>'
-			gt'bdsm_hallway','foyer'
-		end
-	end
 
-	if bdsmclub['role'] = '':
+	if $bdsmclub['role'] = '':
+		*nl
+		'You have not chosen a role in the dressing room so you cannot enter the rest of the club.'
 		act 'Go to Dressing room': gt 'bdsm_dressing'
 	else
 		act 'Go to Dressing room': gt 'bdsm_dressing'
-		act 'Go upstairs to the west wing landing':gt 'bdsm_landing', 'west'
-		act 'Go upstairs to the east wing landing':gt 'bdsm_landing', 'east'
+		act 'Go to Reception':gt 'bdsm_mansion', 'reception'
+		act 'Go upstairs':gt 'bdsm_landing'
+		act 'Go down to the basement':gt 'bdsm_basement', 'start'
+		act 'Go to the Rest room': gt 'bdsm_bathrooms', 'restroom'
 		act 'Go to the Dining room':gt 'bdsm_dining'
-		act 'Go to the west wing hallway':gt 'bdsm_hallway', 'west'
-		act 'Go to the east wing hallway':gt 'bdsm_hallway', 'east'
-		act 'Go to the rest room': gt 'bdsm_bathrooms', 'restroom'
+		act 'Go to the Ball room':gt 'bdsm_ballroom', 'ballroom'
+		act 'Go to the Conservatory': gt 'bdsm_conservatory'
+		act 'Go to the Kitchen':gt 'bdsm_kitchen', 'kitchen'
 	end
-end
-
-if $ARGS[0] = 'west':
-    $location_type = 'private'
-	$loc = 'bdsm_hallway'
-	$loc_arg = 'west'
-	$menu_loc = 'bdsm_hallway'
-	$menu_arg = 'west'
-	menu_off = 0
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/hall.jpg"></center>'
-	'You are standing in the west wing hallway, the reception and office are located here. If you need to speak to management, you need to go to the reception.'
-	'The dressing room is to your right and at the end of the hallway is the ball room leading to the atrium.'
-	act 'Go to the foyer':gt 'bdsm_hallway', 'foyer'
-	act 'Go to reception':gt 'bdsm_mansion', 'reception'
-	act 'Go to the libary':gt 'bdsm_library'
-	act 'Go to the Ball room':gt 'bdsm_ballroom', 'ballroom'
-end
-
-if $ARGS[0] = 'east':
-    $location_type = 'private'
-	$loc = 'bdsm_hallway'
-	$loc_arg = 'east'
-	$menu_loc = 'bdsm_hallway'
-	$menu_arg = 'east'
-	menu_off = 0
-	killvar '$locclass'
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/hall.jpg"></center>'
-	'You are standing in the east wing hallway, you can feel the warm air from the conservatory to your right and the dinning room is to your left.'
-	'Further down the hallway are the kitchen, pantry and laundry room. At the end of the hall is are stairs leading up to the guest bedrooms and down to the basement.'
-	act 'Go to the foyer':gt 'bdsm_hallway', 'foyer'
-	act 'Go to the conservatory': gt 'bdsm_conservatory'
-	act 'Go to the dining room':gt 'bdsm_dining'
-	act 'Go to the kitchen':gt 'bdsm_kitchen', 'kitchen'
-	act 'Go to the laundry':gt 'bdsm_kitchen', 'laundry'
-	act 'Go upstairs to the west wing landing':gt 'bdsm_landing', 'west'
-	act 'Go down to the basement':gt 'bdsm_basement', 'start'
 
+!! Random scenes
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -85,7 +44,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return': gt 'bdsm_hallway', 'east'
+		act 'Return': gt 'bdsm_hallway', 'foyer'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -96,7 +55,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
 		
-		if bdsmclub['role'] = 'sub':
+		if $bdsmclub['role'] = 'sub':
 		    'The woman rides her ponyboy over to you and looks you over, grabbing hold of your chin as if she was inspecting you. "Well arn''t you just a cute little filly. I''ve been thinking about putting my boy here out to stud and I think you will do nicely. Come along." She says as she attaches a lead to your collar from the saddle, the she uses the spurs to get ponyboy going and rides him up the stairs pulling you behind them.'
 			!follow up scene to come
 		end
@@ -104,7 +63,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return': gt 'bdsm_hallway', 'east'
+		act 'Return': gt 'bdsm_hallway', 'foyer'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -115,7 +74,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
 		
-		if bdsmclub['role'] = 'sub':
+		if $bdsmclub['role'] = 'sub':
 		    'The man in leathers notices you and smiles, motioning you over as he keeps talking to the couple.'
 			'You obediently walk over to him, as you do he simply points a finger at the floor and you kneel down next to the other girl.'
 			'After several minutes the man ends his conversation with the couple. "Well it was nice seeing you again, but I need to get going. As you can see I have a couple of bitches in need of training." He says with a laugh, while the couple look at you with a knowing smile.'
@@ -126,7 +85,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return': gt 'bdsm_hallway', 'east'
+		act 'Return': gt 'bdsm_hallway', 'foyer'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -137,7 +96,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return': gt 'bdsm_hallway', 'east'
+		act 'Return': gt 'bdsm_hallway', 'foyer'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -158,7 +117,7 @@ if $ARGS[0] = 'east':
 			gs 'arousal', 'end'
 			gs 'stat'
 		
-			act 'Return': gt 'bdsm_hallway', 'east'
+			act 'Return': gt 'bdsm_hallway', 'foyer'
 		end
 	end
 end

locations/bdsm_kitchen.qsrc

@@ -10,8 +10,9 @@ if $ARGS[0] = 'kitchen':
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/kitchen.jpg"></center>'
-	act 'Go to the east hall': gt 'bdsm_hallway', 'east'
-	act 'look in the pantry': gt 'bdsm_kitchen', 'pantry'
+	act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
+	act 'Go to the laundry room': gt 'bdsm_kitchen', 'laundry'
+	act 'Look in the pantry': gt 'bdsm_kitchen', 'pantry'
 end
 
 if $ARGS[0] = 'laundry':
@@ -23,7 +24,7 @@ if $ARGS[0] = 'laundry':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/laundry.jpg"></center>'
 	'The laundry'
-	act 'Go to the east hall': gt 'bdsm_hallway', 'east'
+	act 'Return to the Kitchen': gt 'bdsm_kitchen', 'kitchen'
 end
 
 if $ARGS[0] = 'pantry':

locations/bdsm_landing.qsrc

@@ -2,54 +2,34 @@
 $location_type = 'private'
 killvar '$locclass'
 
-if $ARGS[0] = 'west':
-	*clr & cla
-	$loc = 'bdsm_landing'
-	$loc_arg = 'west'
-	$menu_loc = 'bdsm_landing'
-	$menu_arg = 'west'
-	menu_off = 0
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/wlanding.jpg"></center>'
-	act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
-	act 'Go downstairs to the foyer':gt 'bdsm_hallway', 'foyer'
-	act 'Visit the master bedroom':gt 'bdsm_bedwest', 'master'
-	act 'Visit guest bedroom A':gt 'bdsm_bedwest', 'guest'
-	act 'Visit the games room':gt 'bdsm_gameroom'
+*clr & cla
+$loc = 'bdsm_landing'
+$loc_arg = 'west'
+$menu_loc = 'bdsm_landing'
+$menu_arg = 'west'
+menu_off = 0
+gs 'stat'
+'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/wlanding.jpg"></center>'
 
-	if rand (0,100) < 3:
-		menu_off = 1
-		*clr & cla
-		gs 'stat'
-		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_sex_b1.mp4"></video></center>'
-		'A maid is being helped with the vacuum cleaning by a man in casual clothing, you think about reporting him, but he''s a bit busy right now.'
-		
-		gs 'arousal', 'voyeur_sex', 5
-		gs 'arousal', 'end'
-		gs 'stat'
-		
-		act 'Return': gt 'bdsm_landing', 'west'
-	end
-end
+act 'Go downstairs to the foyer':gt 'bdsm_hallway', 'foyer'
+act 'Visit the master bedroom':gt 'bdsm_bedwest', 'master'
+act 'Visit guest bedroom':gt 'bdsm_bedwest', 'guest'
+act 'Visit guest bedroom 2':gt 'bdsm_bedeast', 'start'
+act 'Go to the bathroom': gt 'bdsm_bathrooms', 'bath'
+act 'Visit the games room':gt 'bdsm_gameroom'
 
-if $ARGS[0] = 'east':
+if rand (0,100) < 3:
+	menu_off = 1
 	*clr & cla
-	killvar '$locclass'
-	$loc = 'bdsm_landing'
-	$loc_arg = 'east'
-	$menu_loc = 'bdsm_landing'
-	$menu_arg = 'east'
-	menu_off = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/elanding.jpg"></center>'
-	act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
-	act 'Go downstairs to the foyer':gt 'bdsm_hallway', 'foyer'
-	act 'Go downstairs to the west wing hallway':gt 'bdsm_hallway', 'west'
-	act 'Visit guest bedroom B':gt 'bdsm_bedeast', 'guestB'
-	act 'Visit guest bedroom C':gt 'bdsm_bedeast', 'guestC'
-	act 'Visit guest bedroom D':gt 'bdsm_bedeast', 'guestD'
-	act 'Go to the bathroom': gt 'bdsm_bathrooms', 'bath'
-	act 'Go to the living room': gt 'bdsm_livingroom'
+	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_sex_b1.mp4"></video></center>'
+	'A maid is being helped with the vacuum cleaning by a man in casual clothing, you think about reporting him, but he''s a bit busy right now.'
+	
+	gs 'arousal', 'voyeur_sex', 5
+	gs 'arousal', 'end'
+	gs 'stat'
+	
+	act 'Return': gt 'bdsm_landing', 'west'
 end
 
 --- bdsm_landing ---------------------------------

locations/bdsm_library.qsrc

@@ -1,27 +0,0 @@
-# bdsm_library
-
-$location_type = 'private'
-$loc = 'bdsm_library'
-$loc_arg = ''
-$menu_loc = 'bdsm_library'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/library.jpg"></center>'
-'Library, full of books.'
-
-if hour = 18:
-	menu_off = 1
-	pcs_horny += 10
-	*clr & cla
-	gs 'stat'
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/librand.mp4"></video></center>'
-	'It looks like the librarian has put one of the books back in the wrong place, she really does seem to like the being punished.'
-	act 'Leave her to it': gt 'bdsm_hallway', 'west'
-end
-
-act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
-
---- bdsm_library ---------------------------------
-

locations/bdsm_livingroom.qsrc

@@ -1,17 +0,0 @@
-# bdsm_livingroom
-
-$location_type = 'private'
-$locclass = 'livingr'
-$loc = 'bdsm_livingroom'
-$loc_arg = ''
-$menu_loc = 'bdsm_livingroom'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/living.jpg"></center>'
-'Living room'
-act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
-
---- bdsm_livingroom ---------------------------------
-

locations/bdsm_mansion.qsrc

@@ -8,7 +8,7 @@
 	bdsmclub['annatraining'] = 1 - bypass train if you have been trained by Anna
 	bdsmclub['training_daystart'] = daystart - check to stop further training on same day
 	bdsmclub['payday'] = daystart - subscription paid for dom access due every 30 days
-	bdsmclub['role'] = 'sub' or 'dom' - access used and maintained during that visit as either a sub or a dom
+	$bdsmclub['role'] = 'sub' or 'dom' - access used and maintained during that visit as either a sub or a dom
 }
 
 if $ARGS[0] = 'taxi':
@@ -188,7 +188,7 @@ if $ARGS[0] = 'reception':
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
 		'You go to the reception, Mistress Elektra is sitting at her desk looking a little bored.'
 	end
-	act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
+	act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
 	act 'Go to the garage': gt 'bdsm_garden', 'garage'
 end
 

locations/body.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'UpdateBodyMeasurement':
 	pcs_waist = (pcs_hips  * bodyVars['wratio']) / 100 + bodyVars['vofat']
 	pcs_band  = (pcs_waist * bodyVars['bratio']) / 100 + bodyVars['vofat']
 	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10))
-	pcs_butt  = (pcs_hips  * 10    ) / 100 + bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + bodyVars['butt_cheat'] + pcs_butt_tr + max(-5, min(bodyVars['butt_other'], 5))
+	pcs_butt  = min(pcs_mass['butt'], 50) + bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + bodyVars['butt_cheat'] + pcs_butt_tr + max(-10, min(bodyVars['butt_other'], 10))
 
 	!! pcs_cupsize = pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] - bodyVars['vofat']
 	pcs_cupsize = pcs_bust - pcs_band
@@ -71,7 +71,7 @@ if $ARGS[0] = 'CalcWeight':
 	This is an approximation, so that a sveta with a different height has the same BMI for the same pcs_mass['body'] values.
 	The default height of 170 cm is used as a starting point. The bmi deviates by 0.06 for a deviation of 10cm and 0.4 for a deviation of 20cm.}
 
-	result = (600 + 7 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']) + 14 * (pcs_hgt - 170)) / 20
+	result = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']) + 70 * (pcs_hgt - 165)) / 100
 
 	!{Do not remove (julzor)
 	This is the old more complex function, but it doesn''t work correctly.
@@ -83,7 +83,7 @@ end
 
 if $ARGS[0] = 'CalcWeight2':
 	!! weight2 = 10 * weight
-	result = (600 + 7 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']) + 14 * (pcs_hgt - 170)) / 2
+	result = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']) + 70 * (pcs_hgt - 165)) / 10
 	!result = (pcs_hgt * 62 / 17) + (10 * (vhips + (bodyVars['vofat'] * 2))) / 4 + 10 * tits
 end
 
@@ -98,6 +98,10 @@ if $ARGS[0] = 'CalcBMI2':
 end
 
 
+if $ARGS[0] = 'CalcOptBodyMass':
+	result = ((pcs_hgt * pcs_hgt * 225) - 2820000 - 70000 * (pcs_hgt - 165)) / (550 * (60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']))
+end
+
 
 
 	!!===================================================!!
@@ -472,26 +476,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/body_desc.qsrc

@@ -389,12 +389,14 @@ end
 
 if $ARGS[0] = 'butt':
 	!natural butt
-	if pcs_butt <= 4:
+	if pcs_butt <= 14:
 		$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
-	elseif pcs_butt <= 8:
+	elseif pcs_butt <= 25:
 		$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>.'
-	elseif pcs_butt <= 12:
+	elseif pcs_butt <= 40:
 		$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is bigger, rounder and firmer than average.'
+	elseif pcs_butt <= 59:
+		$pcs_butt = 'You have a large heart-shaped <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
 	else
 		$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
 	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_redlight.qsrc

@@ -31,9 +31,9 @@ if $ARGS[0] = 'start':
 	else
 		'The strip club is closed for the day and will reopen at 18:00.'
 	end
-	if pornstudio = 1 and hour >= 10 and hour < 22:
+	if pornstudio > 0 and hour >= 10 and hour < 22:
 		'The <a href="exec:gt ''pornstudio'', ''start''">porn studio</a> is housed within one of the few warehouses that hasn''t been abandoned.'
-	elseif pornstudio = 1 and (hour < 10 or hour >= 22):
+	elseif pornstudio > 0 and (hour < 10 or hour >= 22):
 		'The porn studio is closed and will reopen at 10:00.'
 	end
 	if hour < 3 or hour >= 11: 

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[1] = '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[1] = '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/gadhouse.qsrc

@@ -1081,7 +1081,7 @@ if $ARGS[0] = 'grandma':
 				elseif temp = 7:
 					'"One day, my mother, rest her soul, sent us four siblings out to the forest for berry gathering", your grandma begins. "We took our berry collectors and headed out. We reached the forest entrance quickly and decided that it would be best to split up to complete the task faster. Since we were familiar with the area, we all dispersed to our cherished spots and began gathering berries."'
 					'"My favourite spot was a plot surrounded by dense bushes, and in the middle of the plot, there was a huge stump. It was a great spot, and as I approached, I noticed a vast number of ripe strawberries. I rejoiced over the thought that I would gather more than my brothers, slowly gathering the berries and putting them in my berry collector. Then, suddenly, I hear some rustling behind the bushes. I turn towards the sound, but I''m met with silence. I didn''t notice anyone, but I still couldn''t get rid of the eerie feeling."'
-					'"I shook off the eerie feeling and returned to gathering strawberries again. All of a sudden, I get this strange feeling... I look up, and I see a person squatting on the stump. He''s completely still and just stares at me. I got terrified and ran away, screaming and crying towards my brothers. They tried to stop and calm me down, but I kept running. My brothers started running after me, trying to keep up. I could hear my oldest brother shouting to run towards the kolkhoz. You saw Sveta a long time ago. Your grandma explains that we had central collective farms called kolkhoz."'
+					'"I shook off the eerie feeling and returned to gathering strawberries again. All of a sudden, I get this strange feeling... I look up, and I see a person squatting on the stump. He''s completely still and just stares at me. I got terrified and ran away, screaming and crying towards my brothers. They tried to stop and calm me down, but I kept running. My brothers started running after me, trying to keep up. I could hear my oldest brother shouting to run towards the kolkhoz. You see <<$pcs_firstname>>, a long time ago we had central collective farms called kolkhoz."'
 					'"We were lucky that the farms were close to the forest and didn''t have to run through the woods for long. I kept looking back to see if this person was following us, but there was no sign of him. We knew we were safe when we saw the brigade''s farmers. My brothers and I ran to the foreman and explained what had happened. He immediately grabbed the phone and called someone. The other farmers reassured us that we were safe now. After we had calmed down, we got sent home. Our mother met us at home. She fed us and comforted me."'
 					'"The following day, we were informed that some people found dismantled railroad rails not far from the train station Ratomka. Apparently, it was done by the man I encountered in the forest. I didn''t know it then, but before the war, our area was prone to sabotage by infiltrators. Staying hidden was easy, as the territory is covered by forest, stretching to the border."'
 					'"Ever since that day, the fear I experienced never disappeared, as I''ve felt it throughout my life. I''ll carry on this fear for the remaining days of my life..."'
@@ -1707,7 +1707,7 @@ if $ARGS[0] = 'intro':
 			if month = 6:
 				'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "The work around the farm normally gets done in the morning, so you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you, she misses you rolling your eyes.'
 			else
-			'As soon as you get off your now coverless bed, <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is almost over. You can''t sleep in anymore, not even for another fifteen minutes." Of course, she''s not even looking at you while she talks, but luckily for you, she misses you rolling your eyes.'
+				'As soon as you get off your now coverless bed, <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is almost over. You can''t sleep in anymore, not even for another fifteen minutes." Of course, she''s not even looking at you while she talks, but luckily for you, she misses you rolling your eyes.'
 			end
 			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
 			act 'Continue':

locations/gadsarai.qsrc

@@ -299,7 +299,7 @@ if $ARGS[0] = 'boar':
 end
 
 if $ARGS[0] = 'barn_room':
-	$location_type = 'private'    
+	$location_type = 'private'
 	$setloc['StageTitle'] = 'Guest Room'
 	$setloc['StageImage'] =   '<<$default_img_path>>village/gad_room'
 	minut += 5

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_events.qsrc

@@ -601,7 +601,7 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 12 and hotcat > 5 and PCloSkirt > 0:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
-		if func('pcs_has_attr', 'OR', 'body_ass_big', 'body_ass_bubble'):
+		if func('pcs_has_attr', 'OR', 'body_ass_big', 'body_ass_heart', 'body_ass_bubble'):
 			'As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel a hand firmly squeezing your ass. As you move to turn around, the hand quickly pulls away. You can tell from his admiring expression that Lazar was the one groping your ass. All the workouts you''ve been doing have made your ass big and firm enough to impress him.'
 		else
 			'As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. You can tell from his disappointed expression that Lazar was the one groping your ass. Perhaps he was expecting something firmer after hanging out with the athletic girls so much? Maybe you should work out more...'

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/homes_properties_attr.qsrc

@@ -138,6 +138,7 @@ if ARRSIZE('home_name') < 4:
 	$home_name['gadbana'] = 'grandparents_house'
 	$home_name['gadgarden'] = 'grandparents_house'
 	$home_name['gadhouse'] = 'grandparents_house'
+	$home_name['gadsarai'] = 'grandparents_house'
 
 
 	!! CITY HOUSE

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/hotel_anna.qsrc

@@ -401,12 +401,9 @@ if $ARGS[0] = '4a':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/zrestr.jpg"></center>'
 					'A set of items stand in front of you
-					<table border=1><tr><td><a href="exec:gs ''hotel_anna_gear'', ''restraints_rope''">Ropes</a></td><td><a href="exec:gs ''hotel_anna_gear'', ''restraints_harness''">Harness</a></td></tr>'
-					
-					!!Don''t forget to move the TR back when re adding this
-					!!'<td><a href="exec:gs ''hotel_anna_gear'', ''restraints_leash''">Collar and leash</a></td><td><a href="exec:gs ''hotel_anna_gear'', ''restraints_cuff''">Cuffs</a></td>'
-
-					act 'go away': gt'pav_hotel'
+					<table border=1><tr><td><a href="exec:gs ''hotel_anna_gear'', ''restraints_rope''">Ropes</a></td><td><a href="exec:gs ''hotel_anna_gear'', ''restraints_harness''">Harness</a></td>'
+					'<td><a href="exec:gs ''hotel_anna_gear'', ''restraints_leash''">Collar and leash</a></td><td><a href="exec:gs ''hotel_anna_gear'', ''restraints_cuff''">Cuffs</a></td></tr>'
+					act 'Leave': gt'pav_hotel'
 				end
 				act'Skip the demo':
 					minut += 10

locations/hotel_anna_gear.qsrc

@@ -733,21 +733,21 @@ if $ARGS[0] = 'toys_wand':
 						gs 'stat'
 						Anna_trust -= 1
 						'"No no! It''s just my hair that stands up! Yes...that''s it." You try to avoid being honest with Anna.'
-						'"Well assuming you are telling the truth... that''s  normal. It''s not something that usually surprise people. Anyway, if you were telling the truth you are really impressionable, i have to say. But we''ll leave that for another day. Let''s head to the front door, you probably have homework to do." Anna leads you to the door, you shake her hand and go outside.'
+						'"Well assuming you are telling the truth... that''s  normal. It''s not something that usually surprise people. Anyway, if you were telling the truth you are really impressionable, i have to say. But we''ll leave that for another day. Let''s head to the door, you probably have homework to do." Anna leads you to the door, you shake her hand and you return to the hotel lobby.'
 						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 				end
 				act'Never felt something like that before':
 					*clr & cla
 					gs 'stat'
-					'"The wand does have it''s own special way of stimulating. It can offer so much more than this. This was only a little demonstration of what it can do... But I think this is enough for today, you learned something new so we''ll end it here, let me show you out, we can continue this next time." Anna leads you to the door, you shake her hand and go to the residential area.'
+					'"The wand does have it''s own special way of stimulating. It can offer so much more than this. This was only a little demonstration of what it can do... But I think this is enough for today, you learned something new so we''ll end it here, let me show you out, we can continue this next time." Anna leads you to the door, you shake her hand and return to the hotel lobby.'
 					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 				act'Emmmh...what am i suppose to feel?':
 					*clr & cla
 					gs 'stat'
 					Anna_see_abrat += 1
-					'"That was enough to move your finger so you definitely felt something that''s for sure. Don''t be blinded by the excitement, especially in BDSM world. It''s easy to over estimate your limits, and that is dangerous when we talk about BDSM. Always, be honest with yourself. That''s enough today. Let me follow you out." Anna leads you to the door, you shake her hand and head out the residential area.'
+					'"That was enough to move your finger so you definitely felt something that''s for sure. Don''t be blinded by the excitement, especially in BDSM world. It''s easy to over estimate your limits, and that is dangerous when we talk about BDSM. Always, be honest with yourself. That''s enough today. Let me follow you out." Anna leads you to the door, you shake her hand and return to the hotel lobby.'
 					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 			end
@@ -808,25 +808,9 @@ if $ARGS[0] = 'restraints_rope':
 	'"What can you tell me about ropes?"'
 	'"They are pretty simple, you can use them to restrain a sub or restrict movements, but there are other uses: For example they can be used to create elaborate patterns tied into a harness called "shibari" but that takes years of training.'
 	'"Also ropes can be used for suspension this is an advantage over tape as ropes are very strong, the ropes we use have soft fibres, sometimes silk so that they are comfortable. A base knowledge of knots is normally required in the beginning you can get away with any knots but if they are used in a suspension game you have to be sure the knots are strong and can be undone quickly if something goes wrong.'
-	'So <<$pcs_nickname>>, do you want to see what ropes can do on you?'
-	act'On me?':
-		*clr & cla
-		AnnaQW['switch'] += 1
-		BDSM_Knowledge += 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr5.jpg"></center>'
-		'"Not necessarily you can learn both ways, I can be your guinea pig if you want to be tying the knots, but you have to follow my instructions or you can learn about knots by watching me tie them on you.'
-		'It is your choice."'
-		act'Tie them on me, I''ll learn from watching you': gt 'hotel_anna_gear', 'restraints_rope_sub'
-		act'Sounds complex but I would like to tie the knots on you': gt 'hotel_anna_gear', 'restraints_rope_dom'
-	end
-	act'OK, I guess. Show me':
-		AnnaQW['sub'] += 1
-		BDSM_Knowledge += 1
-		gt 'hotel_anna_gear', 'restraints_rope_sub'
-	end
-		
-	act'Shouldn''t it be me tying the knots?':
+	'"Ropes are a dominant choice and the best way to learn is by doing so <<$pcs_nickname>>, do you want to tie me up?'
+	
+	act'That sounds fun':
 		AnnaQW['dom'] += 1
 		BDSM_Knowledge += 1
 		gt 'hotel_anna_gear', 'restraints_rope_dom'
@@ -843,67 +827,6 @@ if $ARGS[0] = 'restraints_rope':
 	end
 end
 
-if $ARGS[0] = 'restraints_rope_sub':
-	*clr & cla
-	AnnaQW['sub'] += 1
-	BDSM_Knowledge += 1
-	gs 'arousal', 'foreplay', 5
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/restrope0.jpg"></center>'
-	'"For this you will have to strip naked"'
-	'"Sorry?"'
-	'"It is possible to tie someone up while wearing clothing but it is more complex and you won''t feel the ropes on your skin. Plus clothing can get caught and pinch, trust me you''ll enjoy it more this way."'
-	'Seems you have no choice so you strip. "This will help with understanding the mental side of rope play too, for this you are now the submissive." She starts to bind your arms and legs. Soon ropes wrap your arms and bind both of them behind your back, the ropes continue up and wrapping them above the elbow and then around your chest putting your breasts on display. Another rope binds each of your legs together "This knotting is used for pet play; in that case usually a knee pad and elbow pad are used to avoid bruising but we will be done long before that.'
-	'So how does it feel?"'
-	act'...I''m getting a cramp!...':
-		*clr & cla
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/restrope1.jpg"></center>'
-		'"Hold still I''ll free you." Anna immediately unties you.'
-		'"Thank you Anna. I don''t think I could endure another minute of that"'
-		'"We''re doing this so you can learn. With practice there are some adjustments you can do while bound to avoid cramps, and a good lifestyle could help with that. A fit body can endure a forced position for much longer and some small movements can help your muscles when you stay in the same position for a prolonged time. Now, if you are willing I can show you something else ropes can be used for, I promise no cramps this time. What do you say?"'
-		gs 'hotel_anna_gear', 'restraints_rope_sub1'
-	end
-	act'It''s...strange...':
-		*clr & cla
-		gs 'arousal', 'foreplay', 5
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/restrope1.jpg"></center>'
-		'"That''s the sensation of restricted movement. To avoid cramps you can try some little movements which will help if tied up for a long time, fortunately you seem to be quit good at this.'
-		'This is a basic binding, there are more complex and elaborate ones. In fact there are so many I could never teach you them all. Now, if you are willing I can show you something else ropes can be used for. What do you say?"'
-		gs 'hotel_anna_gear', 'restraints_rope_sub1'
-	end
-end
-
-if $ARGS[0] = 'restraints_rope_sub1':
-	act'...Ok...':
-		*clr & cla
-		gs 'arousal', 'foreplay', 5
-		gs 'arousal', 'end'
-		gs 'stat'
-		AnnaQW['trust'] += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/restrope3.jpg"></center>'
-		'Anna frees you from most of the ropes and works on some knots. "Now raise your legs."'
-		'"I''m swinging!"'
-		'"Yes you are, I cannot let you try the fisting swing. As a swing." Anna shakes her head seeing your reaction, "I was hardly going to suggest a fisting, you still look nervous being naked in front of me."'
-		'"So this will give you an idea of how suspension feels, it also shows how versatile ropes are for BDSM play. Of course you still need to have a secure fixing to suspend someone from safely. This fixing point is good for 150kg so you are perfectly safe.'
-		'Right, We can continue this next time." Anna helps you down and you put your clothes back on, after a few words with Anna she sees you out. "Next time I hope to have something a little more exciting if I can get it arranged, see you then <<$pcs_nickname>>."'
-		'"Thank you Anna, goodbye."'
-		act 'Leave': gt'pav_hotel'
-	end
-	act'Thanks Anna but I think that''s enough for today...':
-		*clr & cla
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr5.jpg"></center>'
-		'"Of course dear. Restraints can be a bit overwhelming when you first try them and they are not for everyone." You put your clothes on, and after exchanging a few words with Anna she leads you to the door. "Next time I hope to have something a little more exciting if I can get it arranged, see you then <<$pcs_nickname>>."'
-		'"Thank you Anna, good bye.'
-		act 'Leave': gt'pav_hotel'
-	end
-end
-
 if $ARGS[0] = 'restraints_rope_dom':
 	*clr & cla
 	gs 'arousal', 'BDSM_give', 5
@@ -911,8 +834,8 @@ if $ARGS[0] = 'restraints_rope_dom':
 	AnnaQW['dom'] += 1
 	BDSM_Knowledge += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr5.jpg"></center>'
-	'"We can try that, but you have to follow my instructions to the letter"'
-	'"Sure. This is easiest if I''m naked, ropes can get caught in clothing unless you know exactly what you are doing." Anna strips down. "I''m keeping the stockings on as they make my legs look great and will not be in the way." She smiles.'
+	'"Ropes can be dangerous so you have to follow my instructions to the letter."'
+	'"This will be easiest if I''m naked, ropes can get caught in clothing unless you know exactly what you are doing." Anna strips down. "I''m keeping the stockings on as they make my legs look great and will not be in the way." She smiles.'
 	'"Ok, now pass that rope around my above my right breast and then below the left, I''ll correct any mistakes at the end." You follow Anna''s instructions until you have wrapped the rope tightly around her breasts in a figure of eight.'
 	act'Continue':
 		*clr & cla
@@ -1114,7 +1037,11 @@ if $ARGS[0] = 'restraints_cuff':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuffn.jpg"></center>'
-		'"Now, the cuffs, cuffs are one of the fastest way to lock limbs together; they also come in all sort of different materials and can provide a variety of uses. There''s also manacles there''s a difference between cuffs and manacles. Usually cuffs is intended to wrap completely wrist or ankle, while manacle doesn''t need to do that. Also manacles usually comes chained together, while cuffs have to be linked. Their use is to restrict movements of course, but they are also a great sign of submission: if otherwise told, letting Master/Mistress find His/Her sub/subs just cuffed without waiting, is a great sign of obedience less than being collared but great anyway... Say <<$pcs_nickname>>, are you willing to try cuffs a little?"'
+		'"Now, the cuffs, cuffs are one of the fastest way to lock limbs together; they also come in all sort of different materials and can provide a variety of uses. Usually cuffs need to be attached together but there are exceptions such as handcuffs."'
+		'"Handcuffs are actually a type of manacle. Manacles usually come chained together, while cuffs have to be linked."'
+		'"Their use is to restrict movement of course, but they are also a great sign of submission: if otherwise told, letting Master/Mistress find His/Her sub/subs just cuffed without waiting, is a great sign of obedience. Less than being collared and both is just, chef''s kiss..."'
+		'"Now these are all about submission training and there is no way you can understand them without being the one wearing them and submitting."'
+		'"So <<$pcs_nickname>>, are you willing to try on some cuffs?"'
 		act'Mmmm...what should I do?':
 			*clr & cla
 			gs 'arousal', 'foreplay', 5
@@ -1128,7 +1055,7 @@ if $ARGS[0] = 'restraints_cuff':
 				AnnaQW['sub'] += 1
 				BDSM_Knowledge += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff0.jpg"></center>'
-				'You what Anna orders you to. "L-like... t-this?"'
+				'You do what Anna orders you to. "L-like... t-this?"'
 				'"Exactly, now I will take care of the rest."'
 				act'Let Anna do her work...':
 					*clr & cla
@@ -1155,16 +1082,20 @@ if $ARGS[0] = 'restraints_cuff':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
 						'"Sure <<$pcs_nickname>> Just lay still and I''ll unlock the cuffs." Anna starts freeing your ankles and wrists.'
-						'"Just remember, I won''t force you to do anything you don''t want... the main things is to improve your knowledge about this, and I feel you learned something today." Anna smiles at you in a reassuring way. Once free and with your panties back on, she takes you to the front door where you say goodbye'
+						'"Just remember, I won''t force you to do anything you don''t want... the main things is to improve your knowledge about this, and I feel you learned something today." Anna smiles at you in a reassuring way."'
+						'"Once free and with your panties back on, she directs you to the door where you say goodbye'
 						act 'Leave': gt'pav_hotel'
 					end
 				end
 			end
-			act'I-is ... that...necessary?':
+			act'Is that necessary?':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuffn.jpg"></center>'
-				'"Like I told you this will help you better understand all aspects of BDSM... That way you''ll have a better knowledge of what cuffs can be used for, and when to use them."'
+				'"Like I told you the only way to understand what the cuffs symbolize is from the perspective of a submissive and in order to experience that you must be vulnerable."'
+				'"You can''t be much more vulnerable than lying on my bed with no panties one, can you?"'
+				'Her weird logic does make sense even if you suspect being used.'
+				'"You do want to understand exactly what cuffs can be used for, and when to use them?"'
 				act'O-ok....':
 					*clr & cla
 					gs 'stat'
@@ -1201,10 +1132,11 @@ if $ARGS[0] = 'restraints_cuff':
 						end
 					end
 				end
-				act'I''m sorry Anna, i cannot do that...':
+				act'I''m sorry Anna, I cannot do that':
 					cla
 					gs 'stat'
-					'"No worries." Anna smiles at you in a reassuring way. "If you don''t want to I will not force you. We''ll end it here, but I hope you''ve learned a little bit about cuffs and what they bring to BDSM. Now, I think it''t time you got home, you probably have homework to do." Anna leads you to the door and you say goodbye and leave.'
+					'"No worries." Anna smiles at you in a reassuring way. "If you don''t want to I will not force you. We''ll end it here, but I hope you''ve learnt a little bit and it does seem you are starting to understand you boundaries with power dynamics." She says with a smile.'
+					'"Now, I think it''t time you got home, you probably have homework to do." Anna leads you to the door and you say goodbye and leave.'
 					act 'Leave': gt'pav_hotel'
 				end
 			end
@@ -1213,150 +1145,60 @@ if $ARGS[0] = 'restraints_cuff':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuffn.jpg"></center>'
 				'"That''s okay." Anna smiles at you in a reassuring way.'
-				'"I''m not going to push you into doing things you don''t want to, We''ll wrap this up for now, but I hope you''ve learned a thing or two about cuffs and what they can be used for. Now you should get going home, it''s getting late and I got some housework to do." Anna leads you to the front door and you say goodbye and leave.'
+				'"I''m not going to push you into doing things you don''t want to, We''ll wrap this up for now, but I hope you''ve learned a thing or two about cuffs and what they can be used for. Now you should get going home, it''s getting late and I got some housework to do." Anna leads you to the door and you say goodbye and leave.'
 				act 'Leave': gt'pav_hotel'
 			end
 		end
-		act'On you? Sure...you got ropes too...this should be fun.':
-			*clr & cla
-			gs 'stat'
-			AnnaQW['dom'] += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuffd0.jpg"></center>'
-			'"I totally agree. Ropes could be really fun; but you asked for cuffs and we should focus on that today."'
-			'"Okay, we''ll just do cuffs today then."'
-			'"But I have to tell you there is not really much point in me using the cuffs, this is about you learning what cuffs can bring to BDSM and the different ways it can be used to restrict movement. Some items could require me to offer you a practical demonstration so you don''t make mistakes, or simply to let you have some practice. So... if you are willing you should lay on your belly and remove your panties."'
-			act'No way!':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuffd1.jpg"></center>'
-				'"No way, if we can''t try them on you we''re not doing it."'
-				'"Cuffs have a meaning dear, and you need to learn all aspects of this. We are not a BDSM session now, this is an learning session and has no meaning unless you are willing to try. but as i said i won''t force you if you don''t want to."'
-				'"I think it''s best if we end it here today."'
-				'"Sure, we wrap ut. Let me lead show you out." You both walk out of the bedroom and down the hallway to the front door where you say goodbye.'
-				act 'Leave': gt'pav_hotel'
-			end
-			act'Mfffh...do not try anything. Was i clear?':
-				*clr & cla
-				gs 'stat'
-				BDSM_Knowledge += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff0.jpg"></center>'
-				'"This is an instructive session and has no meaning unless you feel personally it does. You have nothing to be worried about." You do as Anna says.'
-				'"You say that, but you''re not gonna try anything right?"'
-				'"Again, instructive session dear. This is just to teach. Now, let me do the rest."'
-				act'Let Anna do her work...':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
-					'"As you can see, cuffs can be used to made subs assume revealing positions. There''s a lot to talk about when it comes to exposure, but we don''t have that much time. Anyway this will help you have a basic idea... So <<$pcs_nickname>>... how is it?"'
-					act'It''s not a big deal...':
-						*clr & cla
-						gs 'stat'
-						AnnaQW['trust'] += 1
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
-						'"I thought it would be worse"'
-						'"Now that you''ve got a better understanding. Remember, what you learn from our sessions is entirely up to you. We are doing this to improve your knowledge, and we''ve learned a lot today I''d say so we''ll end it here."'
-						'You nod. "Okay" Anna smiles at you as she removes your cuffs; once free and with your panties back on, you chat a little bit about school before you say goodbye and leave.'
-						act 'Leave': gt'pav_hotel'
-					end
-					act'Can you free me now?':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
-						'"Sure <<$pcs_nickname>>... just give me a moment." Anna starts freeing your ankles and wrists.'
-						'"Just remember <<$pcs_nickname>> I won''t force you to do anything you don''t want to... the main things is for you to learn, and it seems you''ve learned enough today."'
-						'"Just get me out of this please." Anna smiles as she removes your cuffs. Once your arms and legs are free you hurriedly get dressed, you chat a little with Anna before she she walks you to the front door and say goodbye and walk out to the residential area.'
-						act 'Leave': gt'pav_hotel'
-					end
-				end
-			end
-		end
-		act'On me?':
+		act'I''m sorry Anna, I can''t...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuffn.jpg"></center>'
-			'"Well, yes. This is a learning session after all, I''ll help you to put cuffs on of course; but there''s not much sense in me trying the cuffs on so you can just look. This is intended to show what cuffs can offer you in terms of restriction and their in putting the body on display. Other items would require me to offer you a practical demonstration so we avoid mistakes, or simply to let you have some practice. Now...if you are willing to try you should lay on your belly and remove your panties."'
-			act'Ok....':
-				*clr & cla
-				gs 'stat'
-				BDSM_Knowledge += 1
-				AnnaQW['switch'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff0.jpg"></center>'
-				'You follow Anna''s order. "I-is this correct?"'
-				'"Yes it is, now lay still and I will take care of the rest."'
-				act'Let Anna do her work...':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
-					'Anna puts a couple of cuffs on your wrists and ankles, then she links them together with a x cross strap. "I... so exposed." You blush at the thought of Anna seeing you like this.'
-					'"Cuffs can be used to made subs assume revealing positions as you can see. I could go on about different uses but we don''t have all the time in the world. But this should help you have a basic idea so... Impressions?... Feelings?... Sensations?... Tell me <<$pcs_nickname>>... how is it?"'
-					act'I-i...':
-						*clr & cla
-						gs 'stat'
-						if Anna_see_asub >= 10:
-							AnnaQW['trust'] += 1
-						end
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff2.jpg"></center>'
-						'"I-i..."'
-						'"No words... I suspect you really felt something. But I don''t think we should puss this much further... the main thing today is to improve your basic knowledge, and we''ve done that today. Now... let me loosen the cuffs." You nod. Anna smiles at you while freeing you; once freed and with your panties on, you chat a little bit about school before you leave.'
-						act 'Leave': gt'pav_hotel'
-					end
-					act'C-can you free me now?':
-						*clr & cla
-						gs 'stat'
-						if Anna_see_asub >= 10:
-							Anna_see_asub -= 1
-						end
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
-						'"Sure <<$pcs_nickname>>... just let me get undo the straps." Anna start freeing your ankles and wrists.'
-						'"I want you to remember that I won''t make you do anything you don''t want to... the main things is that you learn, and I think you''ve learned enough for today." She smiles and removes the cuffs... Once freed and with your panties on, chat a little thanking her for teaching you before you leave.'
-						act 'Leave': gt'pav_hotel'
-					end
-				end
-			end
-			act'I''m sorry Anna, I can''t...':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuffn.jpg"></center>'
-				'"No worries." Anna smiles at you in a reassuring way.'
-				'"Let me just get these cuffs off you. Ok, then I think we''re done for today; I hope you''ve learned a little bit more about BDSM. Let me walk you out" Anna leads you to the front and you walk out to the residential area.'
-				act 'Leave': gt'pav_hotel'
-			end
+			'"No worries." Anna smiles at you in a reassuring way. Submission isn''t for everyone."'
+			'"Ok, then I think we''re done for today; I hope you''ve learned a little bit more about BDSM. Let me walk you out" Anna leads you to the door and you return to the hotel lobby.'
+			act 'Leave': gt'pav_hotel'
 		end
 	end
 	act'Leave':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
-		'"Alright. If you don''t want to I can understand that and I won''t force you. Just think about some of the things you''ve seen here today okay? Now, let me show you out." Anna leads you to the front door and you leave.'
+		'"Alright. If you don''t want to I can understand that and I won''t force you. Just think about some of the things you''ve seen here today okay? Now, let me show you out." Anna leads you to the door and you return to the hotel lobby.'
 		act 'Leave': gt'pav_hotel'
 	end
 end
-		
+
 if $ARGS[0] = 'restraints_leash':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr5.jpg"></center>'
 	'"What about this. What can you tell me about the collar and leash?"'
-	'"Good choice dear, a collar and leash is a classic... That one is a simple leather set, there''s not much to say though they are quite self explanatory. I brought them to explain you something else. Getting collared is a meaningful ritual within the BDSM community: to be collared means that the slave is owned by the Master/Mistress; it''s one of the highest signs of obedience for the slave. Leash is intended to be the hand that grip slave''s life, and a tool to guide them. So <<$pcs_nickname>>... are you willing to try the collar and the leash? If so just strip this will allow me to explain its purpose better."'
-	act'The...i-i...o-ok...':
+	'"The choice of a submissive, a collar and leash is a classic... That one is a simple leather set, there''s not much to say though they are quite self explanatory."'
+	'"I brought them to explain to you something else. Getting collared is a meaningful ritual within the BDSM community: to be collared means that the slave is owned by the Master/Mistress; it''s one of the highest signs of obedience for the slave."'
+	'"The leash is intended to be the hand that grips slave''s life, and a tool to guide them."'
+	'"So <<$pcs_nickname>>... are you willing to try the collar and the leash? If so just strip this will allow me to explain its purpose better."'
+	act 'OK':
 		*clr & cla
 		gs 'stat'
 		AnnaQW['sub'] += 1
 		BDSM_Knowledge += 1
 		'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/collnomean.mp4"></video></center>'
-		'You strip down; Anna puts the collar on you and closes it around your neck, she then links the leash to the collar. "You know some collars can be worn as a jewelry you know. You look wonderful dear. I don''t mean anything by it of course... Ok <<$pcs_nickname>>... let''s go for a walk, are you willing to try that? Few steps in the room, nothing serious... Then you can show me if you are able to understand what the meaning of submission is."'
-		act'Show':
+		'You strip down; Anna puts the collar on you and closes it around your neck, she has you kneel down so she can attach the leash. "Some collars can be worn as a jewellery you know. You look wonderful dear."'
+		'"Ok <<$pcs_nickname>>... let''s go for a walk? Just a few steps around the room, nothing serious. First, can you show me what it is to be submissive?"'
+		act 'Show her':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashow.jpg"></center>'
-			'You show Anna what it means to be a good puppy... You stand naked in front of her holding the leash shake with your mouth. Anna seems to be pleased, but she seems to not be really interested in your willing performance. "That''s a good way to show obedience. Just remember there is no right or wrong today, this just to for you to get a feeling of the collar and the leash." Looks at you kindly. "Shall we go?" You nod.'
-			act'Follow Anna''s lead...':
+			'You show Anna what it means to be a good puppy... You stand naked in front of her holding the leash in your mouth. Anna seems to be pleased, but she seems to not be really interested in your willing performance."'
+			'"That''s a good way to show obedience. Just remember there is no right or wrong today, this just to for you to get a feeling of the collar and the leash." She looks at you kindly. "Shall we go?"'
+			'You nod.'
+			act 'Follow Anna''s lead...':
 				*clr & cla
 				gs 'stat'
 				AnnaQW['trust'] += 1
 				'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/leash.mp4"></video></center>'
-				'Anna lets you walk in the room a little; understanding the meaning of being exposed "How is it going so far <<$pcs_nickname>>?"'
-				act'...Fine...i think...':
+				'Anna walks you around the room a little, you feel exposed and a little humiliated."'
+				'"How is it going so far <<$pcs_nickname>>?"'
+				act '"Fine, I think"':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
@@ -1364,32 +1206,43 @@ if $ARGS[0] = 'restraints_leash':
 					'"Thank you Anna." You get dressed and chat a little about collars before saying goodbye and leaving.'
 					act 'Leave': gt'pav_hotel'
 				end
-				act'S-stop...':
+				act '"Please stop"':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakstop.jpg"></center>'
-					'You loose all interest in completing the walk. "Uh? Oh... ok." The walk ends. Anna immediately stops as soon as she sees you no longer want to continue. she dosen''t tighten her grip, the only tightness you feel is from the sudden stop. "I assume it was too much for you. I think we should end it here, you should get dressed <<$pcs_nickname>>."'
-					'"Y-yes..." You weren''t able to complete your sentence feeling too much shame from the walk. As soon as you put clothes back on you exchange few words with Anna. She reassures you about the session and your feelings, telling again that there''s no reason to worry as it''s only a learning session. You finally finish the chat and leave for today.'
+					'You lose all interest in completing the walk. "Uh? Oh... ok." The walk ends. Anna immediately stops as soon as she sees you no longer want to continue. She dosen''t tighten her grip but you feel the sudden stop through the collar.'
+					'"I think we should end it here, you should get dressed <<$pcs_nickname>>."'
+					'"Y-yes..."'
+					'You can''t even complete your sentence as the shame pushes down on you. You quickly put your clothes back and exchange few words with Anna.'
+					'She reassures you about the session and your feelings, telling you again that there''s no reason to worry and it''s only a learning session.'
+					'You finally finish the chat and leave for today.'
 					act 'Leave': gt'pav_hotel'
 				end
-				act'...':
+				act 'Too turned on to speak':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakwet.jpg"></center>'
 					'No answer comes from you. "Uh?..." Anna immediately stops moving worried by the lack of answer. "Is there a problem <<$pcs_nickname>>?"'
-					'"Y-yes..."'
-					'"What''s wrong?" You are too ashamed to lift your head: you are soaking wet.'
-					'"M-my... my pussy." Anna immediately realizes what you are talking about.'
-					'"Oh... I see." As if this is totally normal Anna reassures you. "Don''t worry... this can be a highly arousing situation: no matter what end of the leash you''re on. It''s totally natural, but I think we''ll end it there, you''ve learned enough for today. Let me go get your clothes." You put your clothes back on while trying to focus on something else. She reassures you about the session and your feelings. after a brief chat and given yourself time to calm down you say goodbye and leave the apartment.'
+					'"Y-yes."'
+					'"What''s wrong?"'
+					'You are too ashamed to lift your head: you are soaking wet.'
+					'"M-my, my pussy." is all you can manage.'
+					'Anna immediately realizes what you are talking about. "Oh... interesting." Anna says as if its completely normal.'
+					'"Don''t worry. This can be a highly arousing situation regardless of which end of the leash you''re on. It''s totally natural, but I think we''ll end it there, you''ve learned enough for today."'
+					'You put your clothes back on while trying to focus on something else. She reassures you about the session and your feelings. after a brief chat and time to calm down you say goodbye and leave the apartment.'
 					act 'Leave': gt'pav_hotel'
 				end
 			end
 		end
-		act'Don''t show':
+		act'Defy her':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashowno.jpg"></center>'
-			'You stand naked in front of Anna: your body telling you that you shouldn''t do this. Looking into your eyes Anna sees you won''t show her submission she takes the leash and gives to you. "As I told you, I have no ulterior motive... but i can understand your reaction, and i won''t force you. And as I was saying, the collar is a great sign of obedience, and leash is used to guide the slave... When used together it becomes an activity known as pet play. Now... if you want, we can go for a walk: few steps in the room on all fours; nothing serious."'
+			'You are naked and kneeling in front of Anna and will not be more submissive, so you stand up and loo her in eye to show your dominance.'
+			'Anna smiles, "You are starting to understand power dynamics and what you want, very good."'
+			'"As I told you, I have no ulterior motive, but I can understand your reaction, and won''t force you to do anything you do not want."'
+			'"As I was saying, the collar is a great sign of obedience, and leash is used to guide the slave. When used together it becomes an activity known as pet play."'
+			'"Now, if you want to go for a walk just around the room we can do that, nothing serious."'
 			act'Follow Anna''s lead...':
 				*clr & cla
 				gs 'stat'
@@ -1419,7 +1272,10 @@ if $ARGS[0] = 'restraints_leash':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
-				'You shake your head. "Well <<$pcs_nickname>>... in that case we should end it for today. Hopefully I''ve given you some things to think about... and we''ve made some steps forward." She unclips the leash from your collar. "Move your hair so I can get the collar off." Anna removes the collar and gives you back your clothes. Once your clothes are back on you chat a little with Anna; she reassures you that there is no hidden motive. after a little while you say your thanks and head out of the apartment towards the residential area.'
+				'You shake your head. "Well <<$pcs_nickname>>, in that case we should end it for today. Hopefully I''ve given you some things to think about and we''ve made some steps forward." She unclips the leash from your collar.'
+				'"Move your hair so I can get the collar off." Anna removes the collar and you get dressed.'
+				'You chat a little with Anna and she reassures you that learning about BSDM practices can sometimes mean being submissive or Dominant even if that is not in your nature.'
+				'After your chat you say your thanks and head out to the hotel lobby.'
 				act 'Leave': gt'pav_hotel'
 			end
 		end
@@ -1430,161 +1286,22 @@ if $ARGS[0] = 'restraints_leash':
 				AnnaQW['switch'] += 1
 			end
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
-			'"I-i... can''t I''m sorry Anna."'
-			'"Well <<$pcs_nickname>>... in that case we''ll call it a day. The main thing is that you learn... and we''ve made progress." She removes the least from your collar. "Move your hair out of the way so it dosen''t get stuck." Anna removes collar gives you your dress. As soon you''re dressed you talk a bit with Anna; she reassures you about the session saying there''s no underlying meaning and that the session is purely instructional. You feel she has no intention to make you do anything you don''t want to. Once your little chat is over Anna follows you to the front door where you say goodbye and head to the residential area.'
+			'"I can''t I''m sorry Anna."'
+			'"Well <<$pcs_nickname>>... in that case we''ll call it a day. The main thing is that you learn... and we''ve made progress." She removes the leash from your collar.'
+			'"Move your hair so I can get the collar off." Anna removes the collar and you get dressed.'
+			'You chat a little with Anna and she reassures you that learning about BSDM practices can sometimes mean being submissive or Dominant even if that is not in your nature.'
+			'After your chat you say your thanks and head out to the hotel lobby.'
 			act 'Leave': gt'pav_hotel'
 		end
 	end
-	act'If there''s no real meaning...why don''t you let me put the collar on you?':
+	act'Why don''t you let me put the collar on you?':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr5.jpg"></center>'
-		'"Well considering it''s practice... we can do that; I hope you won''t find any problems doing this though so I''ll ask you again: are you sure you won''t try the collar? Do you prefer for me to give a practical demonstration? Generally it''s more instructive if you are the one wear the collar."'
-		act'I''m sure':
-			*clr & cla
-			gs 'stat'
-			AnnaQW['dom'] += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr5.jpg"></center>'
-			'"I''m sure."'
-			'"It''s better than nothing but you won''t learn as much: wait here, i''ll be back." Anna leaves you alone.'
-			act'Wait':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leasha0.jpg"></center>'
-				'"I know it''s not polite to leave guests alone... but my bells was in the other room." Anna comes back after about a minute; she''s now naked kneeling in front of you collared with a leash and a couple of bells on her nipples; she hold her hands behind her head as waiting for something you can''t help but stare at her. "Are we going for a walk?"'
-				act'Take the leash and walk in the room for a little':
-					*clr & cla
-					gs 'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/leash.mp4"></video></center>'
-					'"So <<$pcs_nickname>>, how does it feel to be walking your slave around naked, it''s exhilarating isn''t it?"'
-					'"I''ve never heard of a puppy talking."'
-					'"Right..." You walk Anna for a little. "That''s it we should stop for now."'
-					act 'Leave': gt'pav_hotel'
-				end
-			end
-		end
-		act'Uffh!...ok...you win. Just don''t make a fool out of me.':
-			*clr & cla
-			gs 'stat'
-			BDSM_Knowledge += 1
-			'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/collnomean.mp4"></video></center>'
-			'You strip down; Anna puts the collar on you and closes it around your neck, she then hooks the leash to the collar. "You know... some collars can be worn as a jewelry. I must say, you look beautiful dear. I don''t mean anything by it of course... Ok <<$pcs_nickname>>... let''s go for a walk, are you willing to try a few steps in the room? Nothing serious... Then you can show me if you are able to understand what the meaning of submission is."'
-			act'???':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashdask.jpg"></center>'
-				'"What do you mean?"'
-				'"For example to hold the leash with your mouth, sit on yor knees like a dog sitting on their back legs. Just remember there''s no hidden meaning here <<$pcs_nickname>>. If you don''t want to I will respect that; but also means that i will not correct any behavior one way or another. You are free to do as you please."'
-				'"Exactly, and I won''t do those kind of things"'
-				'"As you wish... Shall we go?"'
-				act'Follow Anna''s lead...':
-					*clr & cla
-					gs 'stat'
-					AnnaQW['trust'] += 1
-					'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/leash.mp4"></video></center>'
-					'Anna lets you walk in the room for a few steps; you begin to understand what it''s like being in such a submissive situation. "You''re doing great, how are you feeling <<$pcs_nickname>>?"'
-					act'I''ve felt worse...':
-						*clr & cla
-						gs 'stat'
-						if Anna_see_adom =< 10:
-							AnnaQW['switch'] += 1
-						end
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashdfine.jpg"></center>'
-						'"Happy to hear it''s not a big deal for you. I think that''s enough for today." The walkie ends. "Even doing a simple practice session with no meaning could be hard we won''t go much furher, I hope <<$pcs_nickname>> I hope this little session has been informative for you; hopefully you got some better idea about the collar and the leash."'
-						'"Just... don''t try anything okay?"'
-						'"Of course not, this is your show, eventually you will decide for yourself what the sessions mean. Well, now that we''re done you can change back into your regular clothes and I''ll see you next time." You get dressed and say goodbye to Anna before you leave.'
-						act 'Leave': gt'pav_hotel'
-					end
-					act'Stop!':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashdstop.jpg"></center>'
-						'The collar presses against you skin as you freeze. "Uh?" Anna immediately lets go letting the leash fall on the floor.'
-						'"I guess it became too much for you... Alright; you can put back your clothes <<$pcs_nickname>> we''re done for today."'
-						'"This was a big mistake."'
-						'"If you think so...then that''s what it was. It seems to have been very instructive though and we learn when we make mistakes." You weren''t able to reply, ashamed by the session; you only want this to end. Anna reassures you about the session and your feelings, saying you did nothing wrong and that it''s okay. Once you''ve gotten dressed again you say goodbye to Anna, hurrying towards the door to leave.'
-						act 'Leave': gt'pav_hotel'
-					end
-					act'Meh...':
-						*clr & cla
-						gs 'stat'
-						Anna_see_abrat += 1
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashmeh.jpg"></center>'
-						'"Is this supposed to teach me something?"'
-						'"It should... you''re not feeling like you''re learning anything?"'
-						'"No, not really"'
-						'"Well, there are two sides to to this so perhaps you lean more towards the dominant part of this, and you''re not really in a dominant position now are you"'
-						'"Are you mocking me?"'
-						'"Don''t be silly <<$pcs_nickname>>... you decide for yourself what you want to do, and you wanted to try this. Now we know you don''t really feel anything about this so we''ve learned something. Since that''s done I think we''ll call it for today."'
-						'"Baf!" Once you''ve gotten your clothes back on you thank Anna for today and leave the apartment.'
-						act 'Leave': gt'pav_hotel'
-					end
-				end
-			end
-			act'Hey!':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashdaskno.jpg"></center>'
-				'Despite standing naked in front of Anna, you refuse to submit. Unexpectedly Anna gives you the leash. "Like I told you, I''m not trying to force you... I get you reaction I really do and can be frightening giving up control like that. Now as i was saying, collar is a great sign of showing obedience. And along with leash they can be used for pet play. Now... if you want of course, we can go for a walk: few steps in the room on all fours; nothing serious."'
-				act'Follow Anna''s lead...':
-					*clr & cla
-					gs 'stat'
-					AnnaQW['trust'] += 1
-					'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/leash.mp4"></video></center>'
-					'Anna lets you walk in the room a few steps so you can get a better understanding of the submissive side. "So, how are things going down there <<$pcs_nickname>>?"'
-					act'I''ve felt worse...':
-						*clr & cla
-						gs 'stat'
-						if Anna_see_adom =< 10:
-							AnnaQW['switch'] += 1
-						end
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashdfine.jpg"></center>'
-						'"Glad to hear it''s not too big a problem... anyway, we should stop for now." The walk ends. "Well <<$pcs_nickname>> I assume it was an instructive session; you should have a better idea about collar, leash, submission and petplay."'
-						'"Just... don''t get any ideas okay?"'
-						'"Don''t worry I won''t. let''s wrap it up and let me get you clothes, we''ll continue next time." You get dressed and chat a bit with Anna before saying goodbye'
-						act 'Leave': gt'pav_hotel'
-					end
-					act'Stop!':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashdstop.jpg"></center>'
-						'The collar presses against your neck as soon as you stop. "Uh?" Anna drops the leash, letting it fall.'
-						'"It can be too much in the beginning... Let''s get your clothes back on we''re done for today."'
-						'"I shouldn''t have done this."'
-						'"It''s not all bad you know, we have made progress and you''ve learned a bit today. Nothing to be ashamed of." You can''t bring yourself to answer, wanting only to go home. Anna tells you that there is nothing to worry about. Once you''ve gotten dressed you say goodbye and hurry out the door.'
-						act 'Leave': gt'pav_hotel'
-					end
-					act'I don''t know':
-						*clr & cla
-						gs 'stat'
-						Anna_see_abrat += 1
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashmeh.jpg"></center>'
-						'"Am I supposed to learn something here?"'
-						'"I don''t know, are you?"'
-						'"Not really"'
-						'"Well, maybe we''ll try something else next time, you might be more dominant something you really aren''t right now."'
-						'"Are you mocking me?"'
-						'"Just saying my dear <<$pcs_nickname>>.. .We went down this road hoping to learn, and we''ve learned this isn''t exactly for you so we''ll stop there for today, let''s get that collar off and you can put your clothes back on." Once you''ve gotten your clothes back on you thank Anna for tonight and say goodbye.'
-						act 'Leave': gt'pav_hotel'
-					end
-				end
-				act'This was a mistake. it''s too much.':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
-					'You shake your head unable to speak. "No worries <<$pcs_nickname>>... We''ll stop for today. Hopefully you''ve learned a little today." She unhooks the leash from your collar, then removes the collar and gives you your clothes. As soon as you''ve put back your back on you chat a little Anna; she reassures you about the session and your feelings, telling again that there''s no underlying meaning. Once you''re done talking you say goodbye and leave.'
-				end
-			end
-			act'Change your mind':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
-				'"I think I''ll have to pass"'
-				'"That''s okay <<$pcs_nickname>> we can continue next time. I hope you''ve learned a little bit though." Anna removes the collar and leash and gives you your clothes, once you''ve gotten dressed you chat a little bit about school and life at home before you leave.'
-				act 'Leave': gt'pav_hotel'
-			end
-		end
-		act'Ok I''ll do it. But I''m not putting on a show...':
+		'"That will not teach you what the collar means. It would maybe help me understand it more but honesty I''ve worn so many of them I don''t think it will."'
+		'"This is about your education of BDSM and if you want to understand the collar and leash I must insist that you wear them."'
+		'"You will not be a submissive just for experimenting, so will you wear them?"'
+		act'Ok I''ll do it. But I''m not putting on a show':
 			*clr & cla
 			gs 'stat'
 			BDSM_Knowledge += 1
@@ -1673,7 +1390,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"I don''t feel like I''m learning anything"'
 						'"Nothing? Are you sure?"'
 						'"Yeah, I''m not really feeling it"'
-						'"Well, that really depends on perspective dosen''t it, we have learned today that this dosen''t really do anything for you. you can always find some way to learn for everything you do. But we''ll end it here so this dosen''t turn into a school lecture, let me get that collar off so you can get dressed". After getting dressed you thank Anna for her time today and walk out of the apartment.'
+						'"Well, that really depends on perspective dosen''t it, we have learned today that this dosen''t really do anything for you. you can always find some way to learn for everything you do. But we''ll end it here so this doesn''t turn into a school lecture, let me get that collar off so you can get dressed". After getting dressed you thank Anna for her time today and walk out of the apartment.'
 						act 'Leave': gt'pav_hotel'
 					end
 				end
@@ -1694,147 +1411,35 @@ if $ARGS[0] = 'restraints_leash':
 				act 'Leave': gt'pav_hotel'
 			end
 		end
-	end
-	act'On me?':
-		*clr & cla
-		gs 'stat'
-		AnnaQW['switch'] += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr5.jpg"></center>'
-		'"Well... it''s better for you to try on the gear yourself first so you''ll get a general idea of what each participant is feeling. that way you''ll know what to do and what not to do. Since we are doing a learning session now you can choose to wear the collar or I can wear it either way I think you''ll learn something. So, what do you want to do?."'
-		
-		act'I''ll try it on':
-			*clr & cla
-			gs 'stat'
-			BDSM_Knowledge += 1
-			'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/collnomean.mp4"></video></center>'
-			'You strip down; Anna helps close the collar around your neck, then she links the leash on the collar. "You look beautiful my dear. Now, <<$pcs_nickname>>... let''s go for a little walk, think you can do that? just a few steps in the room, nothing serious. Maybe you can show me how a submissive should act in this situation."'
-			act'Show':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashow.jpg"></center>'
-				'You show Anna what means to be a good puppy. You stand naked in front of her holding the leash in your mouth. Anna seems to be pleased at your perfomance. "That''s a great way to show obedience <<$pcs_nickname>>. Just remember this is a practice session, we''re just here to teach you the basics. but this is a good start, really shows that you understand the submissive part." Anna smiles at you. "Shall we go?" You nod.'
-				act'Follow Anna''s lead...':
-					*clr & cla
-					gs 'stat'
-					Anna_trust += 1
-					'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/leash.mp4"></video></center>'
-					'Anna lets you walk in the room for a few steps; you understand a bit better what it means to be submissive to a superior. "How''s it going <<$pcs_nickname>>?" '
-					act'It''s...fine...':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
-						'"I''m happy to hear you feel it''s going well but, I think it''s best if we stop for today.</font> The walk ends<font color = blue>"This was a good start, seems like you learned a lot today which is good. Now, let me get that collar off so you can get dressed"</font><br><font color = #DC143C>"Thank you Anna"</font> You get dressed  and thank Anna for her time, she smiles and leads you to the front door.'
-						act 'Leave': gt'pav_hotel'
-					end
-					act'I...don''t like it...':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakbad.jpg"></center>'
-						'You sit on the floor not moving. Anna immediately lets go of her grip on the leash. "I assume it was too much for you <<$pcs_nickname>>, that''s okay, it happens. Let''s get that collar off and get your clothes we''re done for today."'
-						'"I''m sorry Anna, but I don''t think this is for me."'
-						'"I understand <<$pcs_nickname>>, it can be hard sometimes doing this." Anna watches as you get dressed telling you that you shouldn''t feel any shame over what happened. Once you''re fully dressed you thank her and you walk out of her apartment.'
-						act 'Leave': gt'pav_hotel'
-					end
-					act'...':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakwet.jpg"></center>'
-						'You don''t anwser.  Anna looks at you worringly. "Is everything okay <<$pcs_nickname>>?"'
-						'"N-no..."'
-						'"What''s wrong <<$pcs_nickname>> is there a problem with the collar or something?" You just stare at the floor unable to answer: you are soaking wet.'
-						'"M-my... my pussy." You force out. Anna immediately realizes what you are talking about.'
-						'"Oh... I got scared for a moment there." As if this is totally normal Anna reassures you. "Don''t worry... for some this is a highly arousing situation: it doesn''t matter the role. It''s totally natural, but I think it''s better for you to go home now so you can focus on something else, you''ve learned enough for today." Anna removes your collar and you get dressed. After a brief conversation you thank her for understanding and you hurry out the door'
-						act 'Leave': gt'pav_hotel'
-					end
-				end
-			end
-			act'Don''t show':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashowno.jpg"></center>'
-				'You stand naked in front of Anna But you feel like you can''t show her submission. Anna looks into your eyes and sees that you are not going show any submission. Suddenly Anna gives you the leash. "I told you, I''m not going to force you and showing submission takes a lot of courage so your reaction is natural. Today we''re trying to teach you what the submissive feels, nothing else. So, if you want to, we can take a few steps around the room nothing serious so you can get the general idea."'
-				act'Follow Anna''s lead...':
-					*clr & cla
-					gs 'stat'
-					Anna_trust += 1
-					'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/leash.mp4"></video></center>'
-					'Anna lets you walk around for a few steps; you begin to understand the general idea of being subservient to a master. "Everything good so far <<$pcs_nickname>>?"'
-					act'It''s...fine...':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
-						'"Glad to hear it''s not too bad, but let''s stop for today.</font> The walk ends...<font color = blue>"Now, remember this is a learning session, this dosen''t mean anything between us. you choose what to take from this, but I hope you''ve learned a little bit about what it''s like for the submissive to be led by their master or mistress. Anyways, let''s get that collar off so you can get dressed"</font> After getting redressed you talk a little with Anna about the role of being the submissive before you say goodbye and leave.'
-						act 'Leave': gt'pav_hotel'
-					end
-					act'I...don''t like this...':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakbad.jpg"></center>'
-						'You sit on the floor unmoving. "Uh?" Anna drops the leash.'
-						'"I''m guessing this isn''t what you''re looking for then. Maybe it''s best we stop for today <<$pcs_nickname>> what do you say?"'
-						'"I''m sorry Anna, but I dont''t think this is for me."'
-						'"That''s okay, we''re making progress either way" Anna reassures you about the session saying maybe we should try something different next time. Once you''ve gotten the collar off and gotten dressed, you thank Anna for her time and leave.'
-						act 'Leave': gt'pav_hotel'
-					end
-				end
-				act'Don''t...':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
-					'You shake your head unable to speak. "Okay <<$pcs_nickname>>. you''ve learned a little today but we''re stopping for today." Anna unhooks the leash and removes your collar. As soon as you''ve gotten dressed you exchange few words with Anna; she talks session and your feelings, saying that what you felt is perfectly natural. When you are done chatting Anna thanks you for stopping by today and leads you out.'
-					act 'Leave': gt'pav_hotel'
-				end
-			end
-			act'Change your mind':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
-				'"I-i... can''t I''m sorry Anna i have to go."'
-				'"Okay <<$pcs_nickname>>...let''s wrap up for today. Hopefully we''ve made some steps forward today." Anna moves removes the leash and the collar, and gives you your clothes. As soon as you''ve gotten dressed you chat a little bit with Anna, she reminds you that you control the situation and can decide when to stop. When you''re done chatting you thank her and say goodbye before leaving out towards the residential area.'
-				act 'Leave': gt'pav_hotel'
-			end
-		end
-		act'I want you to try the collar':
+		act'No':
 			*clr & cla
 			gs 'stat'
-			BDSM_Knowledge += 1
+			AnnaQW['dom'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr5.jpg"></center>'
-			'"Sure <<$pcs_nickname>>, I''ll be right back." Anna leaves you alone.'
-			act'Turn':
+			'"Fine it''s better than nothing but you won''t really understand the meaning. Wait here, i''ll be back." Anna leaves you alone.'
+			act'Wait':
 				*clr & cla
+				gs 'arousal', 'BDSM_give', 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leasha0.jpg"></center>'
-				'After about a minute Anna returns. "Hope you don''t mind, I''ve got no problems changing in front of you... but my bells was in my room."'
-				'"Okay?" Anna is now naked kneeling in front of you collared with a leash and a couple of bells pending from her nipples; she holds her hands behind her head.'
-				'"Ready to take me for a walk?"'
-				act'Take the leash and walk a little with Anna':
+				'"I know it''s not polite to leave guests alone... but my bells was in the other room." Anna comes back after about a minute.'
+				'She''s now naked and kneeling in front of you collared with a leash and a couple of bells on her nipples. She hold her hands behind her head as if waiting for something you can''t help but stare at her. "Are we going for a walk?"'
+				act'Take the leash and walk in the room for a little':
 					*clr & cla
+					gs 'arousal', 'BDSM_give', 5
+					gs 'arousal', 'end'
 					gs 'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/leash.mp4"></video></center>'
-					'"Not so difficult is it? Just remember to keep a firm grip and have a firm tone so the submissive knows who''s in charge. not just to the submissive mind you but also if there are anyone else around." You continue walk Anna for a little. "That''s it we should stop now."'
-					act 'Leave': gt'pav_hotel'
+					'"So <<$pcs_nickname>>, how does it feel to be walking your slave around naked, it''s exhilarating isn''t it?"'
+					'"I''ve never heard of a puppy talking."'
+					'Anna does not reply but crawls around where you lead her enthusiastically.'
+					'After a few minutes and with you not really sure what you are doing you stop and tell Anna you are done.'
+					'She kneels in front of you and talks as if there is nothing different than during any of your other conversations explaining how petplay works and how it can be used to reenforce other aspects of D/s.'
+					'Once your chat is over you hand her back the leash handle, which she had told you was the correct way to end such a session.'
+					act 'Return to hotel lobby': gt'pav_hotel'
 				end
 			end
 		end
-		
-		act'I think i''ll pass this time.':
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
-			'"Well <<$pcs_nickname>>... in that case we''re done for today. Hopefully you''ve gotten some things to think about tonight."'
-			'"I''m sorry."'
-			'"That''s okay <<$pcs_nickname>> we''ll continue another day, let me show you out." You both chat a little as you walk to the door, when you reach the door you say goodbye and leave.'
-			act 'Leave': gt'pav_hotel'
-		end
-	end
-	act'Leave':
-		*clr & cla
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr5.jpg"></center>'
-		'"That''s okay <<$pcs_nickname>>. We''ll pick this up some other time, let me show you out." You walk towards the door through the hallway chatting as you go. "Hopefully you''ve gotten something to think about before bedtime tonight."'
-		'"I hope so too."'
-		'"Here we are, now hope to see you again soon."you smile to Anna and say goodbye before you leave out towards the residential area.'
-		act 'Leave': gt'pav_hotel'
 	end
 end
 

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/intro_city_select.qsrc

@@ -325,7 +325,7 @@ if $ARGS[0] = 'nerd':
 	pcs_eyesize		-= 1
 	pcs_lashes		-= 1
 	pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
+	pcs_mass['butt_gen']	= 17	& !pcs_butt = feminine
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -396,7 +396,7 @@ if $ARGS[0] = 'nerdqueen':
 		pcs_lip		+= 1
 		pcs_teeth	-= 1
 		pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = bubble
 		pcs_mass['body']		= 65
 
 		!!----- INVENTRORY -----!!
@@ -454,7 +454,7 @@ elseif $ARGS[0] = 'goodstudent':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng		-= 100
 		pcs_mass['bust_gen']	= 18	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = feminine
 		pcs_mass['body']		= 70
 
 		! Other
@@ -515,7 +515,7 @@ elseif $ARGS[0] = 'computergeek':
 		pcs_skin	-= 100
 		pcs_teeth	+= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = feminine
 		pcs_mass['body']	= 42
 
 		! Other
@@ -565,7 +565,7 @@ elseif $ARGS[0] = 'chessplayer':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng		-= 100
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = feminine
 		pcs_mass['body']		= 73
 
 		!!----- RELATIONSHIPS -----!!
@@ -640,7 +640,7 @@ if $ARGS[0] = 'jock':
 	pcs_eyesize		+= 1
 	pcs_lip			+= 1
 	pcs_mass['bust_gen']	= 12	& !B-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
+	pcs_mass['butt_gen']	= 27	& !pcs_butt = bubble
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -689,7 +689,7 @@ if $ARGS[0] = 'volleyball':
 
 		!!----- APPEARANCE -----!!
 		pcs_mass['bust_gen']	= 17	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = bubble
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'gopnik':
 	!!----- SEX STATS -----!!
 	pcs_vag		+= 1
 	pcs_throat	+= 1
-	pcs_butt	+= 8
+	pcs_ass	+= 8
 	stat['hj']	+= 10
 	stat['bj']	+= 5
 	stat['vaginal'] += 1

locations/intro_functions.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'set_base_stats':
 	pcs_heels		= 5
 
 	!!----- APPEARANCE -----!!
-	pcs_hgt			= 170
+	pcs_hgt			= 165
 	dick			= 0
 	pcs_skin		= 500
 	pcs_tan			= 0

locations/katja_city_sex.qsrc

@@ -755,6 +755,7 @@ if $ARGS[0] = 'going_home':
 	$location_type = 'public_outdoors'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/walking_home_at_night.jpg"></center>'
 	'You leave his apartment and walk out into the streets, heading in the direction of the nearest metro station.'
+	katjaQW['on_date'] = 1
 	if katjaQW['QWstage'] = 5:
 		katjaQW['QWstage'] = 6
 		'"So? How was your first time having sex with a man?" you ask after you''ve walked in silence for a few minutes.'
@@ -999,6 +1000,7 @@ if $ARGS[0] =  'blindfold_sex2':
 					act 'Walk to the metro':
 						*clr & cla
 						katjaQW['creampie'] += 1
+						katjaQW['on_date'] = 1
 						minut += 10
 						$location_type = 'public_outdoors'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/walking_home_at_night.jpg"></center>'
@@ -1501,6 +1503,7 @@ if $ARGS[0] = 'two_guys_cumming':
 			act 'Walk to the metro':
 				*clr & cla
 				minut += 10
+				katjaQW['on_date'] = 1
 				if katjaQW['lube'] = 1: katjaQW['lube'] = 0
 				$location_type = 'public_outdoors'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/walking_home_at_night.jpg"></center>'

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_lake.qsrc

@@ -6,7 +6,13 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	$loc = 'katja_lake'
 	$loc_arg = 'start'
-	menu_off = 1
+	$region = 'pav'
+	$menu_loc = 'katja_lake'
+	$menu_arg = 'start'
+	$locclass = 'beach'
+	menu_off = 0
+	$location_type = 'public_outdoors'
+	gs 'stat'
 	if month >11 or month <3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.jpg"></center>'
 		'One good thing about living in Pavlovsk is the access to rivers and lakes. Now that it is winter, this landscape has beautifully transformed, thanks to the ice and snow, into a place where people rush to do things like ice skating, playing hockey and (for the brave) swimming.'
@@ -26,200 +32,271 @@ if $ARGS[0] = 'start':
 		'Katja and you are no less, and go to a secluded beach to do those things... and looking absolutely fabulous doing it.'
 	end
 
-	act 'Lake activities!':
-		*clr & cla
-		minut += 5
-		gs 'stat'
-		if hour >= 20:
-			'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
-			'"Hm? Oh! True! Let''s go back."'
-			'You grab Katja''s hand and accompany her home.'
-			act 'Accompany Katja to her home':minut += 5 & gt 'pav_residential'
-		elseif month >11 or month <3:
-			gt 'katja_lake', 'winter_activities'
-		else
-			if sunWeather = 0 or temper < 20:
-				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'As you suggest to pass some time at the beach, Katja frowns.'
-				'"<<$pcs_nickname>>, I don''t think so, the weather is pretty bad."'
-				'It is evident that this isn''t a good idea. You better to look for something else to do.'
-				act 'Continue': gt 'katjaEV','kathan'
-			else
-				if sound = 0 and month >= 3 and month < 6:
-					PLAY 'sound/lakeshore1.mp3', 30
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.jpg"></center>'
-				elseif sound = 0 and month >= 6 and month < 9:
-					PLAY 'sound/lakeshore1.mp3', 30
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.jpg"></center>'
-				elseif sound = 0 and month >= 9 and month < 12:
-					PLAY 'sound/lakeshore1.mp3', 30
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.jpg"></center>'
-				end
-				'You decide to spend some time at the secluded beach, but as you approach, a question surges into your mind. Go there naked? Katja is pretty body-conscientious, so... maybe going full nudist isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
-				if func('changingroom','count_swim_item') > 0:
-					act 'Put on your swimwear':
-						*clr & cla
-						if katjaQW['slut'] >= 20 and katjaQW['horny'] >= 20:
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL1.jpg"></center>'
-							'As you prepare to change, a long, somewhat husky sigh reaches your ears. It''s come from Katja. She is in her underwear with her eyes closed, the wind playing with her red mane. She is looking sexy as hell.'
-							'"You know <<$pcs_nickname>>, the sun feels nice and there aren''t people around here. So what do you think?"'
-							'It is difficult to link the supposedly timid girl called Ekaterina Meynold with this sensual woman that is trying to tempt you with all her heart (and succeeding) to undress.'
-							'"Think <<$pcs_nickname>>. The water dripping over our naked skin, the wind in our hair and the two of us, all... alone."'
-							'Ok, she is manipulating you. Can you resist the ginger temptress before you?'
-							act 'Of course not!':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL2.jpg"></center>'
-								'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensual eyes.'
-								'"Bitch!"'
-								'You varelly whisper your insult and take the gigling bimbo wannabe towards the secluded beach.'
-								if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
-									act 'Swim':
-										gs 'arousal', 'voyeur', 10
-										if pcs_inhib < 20: inhib_exp += 1
-										gs 'clothing', 'strip_all'
-										gt 'katja_lake', 'swim'
-									end
-								end
-								act 'Tan':
-									gs 'arousal', 'voyeur', 10
-									if pcs_inhib < 20: inhib_exp += 1
-									gs 'clothing', 'strip_all'
-									gt 'katja_lake','tan'
-								end
-								act 'Walk':
-									gs 'arousal', 'voyeur', 10
-									if pcs_inhib < 20: inhib_exp += 1
-									gs 'clothing', 'strip_all'
-									gt 'katja_lake','walk'
-								end
-							end
-							gs 'willpower', 'exhib', 'resist', 'hard' & !! This does not take into consideration inhibition/exhibitionism because Sveta chose to put on the swimwear and Katja is forcing her to undress.
-							if will_cost <= pcs_willpwr:
-								act 'Resist her!': gt 'katja_lake', 'beach_in_swimwear2'
-							else
-								act 'Resist her! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end
-						else
-							gt 'katja_lake', 'beach_in_swimwear1'
-						end
-					end
-				end
-				if pcs_inhib > 20:
-					act 'Go in the nude!':
-						gs 'clothing', 'strip_all' 
-						gt 'katja_lake','beach_nude'
-					end
-				elseif pcs_inhib < 20:
-					gs 'willpower', 'exhib', 'self', 'easy'
-					if will_cost <= pcs_willpwr:
-						act 'Go in the nude!':
-							*clr & cla
-							gs 'willpower', 'pay', 'selft'
-							gs 'clothing', 'strip_all'
-							if pcs_inhib < 20: inhib_exp += 1
-							gs 'stat'
-							gt 'katja_lake','beach_nude'
-						end
-					else
-						act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
-				end
-				act 'Hm... Is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEV','kathan'
-			end
-		end
-	end
+	act 'Lake activities!': gt 'katja_lake', 'lake_activities'
+	act 'Sauna time!': gt 'katja_lake', 'sauna_time'
+end
 
-	act 'Sauna time!':
-		*clr & cla
-		if sauna_daystart = daystart:
+if $ARGS[0] = 'lake_activities':
+	*clr & cla
+	minut += 5
+	gs 'stat'
+	if hour >= 20:
+		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
+		'"Hm? Oh! True! Let''s go back."'
+		'You grab Katja''s hand and accompany her home.'
+		act 'Accompany Katja to her home':minut += 5 & gt 'pav_residential'
+	elseif month >11 or month <3:
+		gt 'katja_lake', 'winter_activities'
+	else
+		if sunWeather = 0 or temper < 20:
 			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'As you suggest to pass some time in the public sauna, Katja frowns.'
-			'"<<$pcs_nickname>>, spending too much time in there isn''t going to do any good, it is best to leave it for another day."'
+			'As you suggest to pass some time at the beach, Katja frowns.'
+			'"<<$pcs_nickname>>, I don''t think so, the weather is pretty bad."'
 			'It is evident that this isn''t a good idea. You better to look for something else to do.'
 			act 'Continue': gt 'katjaEV','kathan'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
-			'You decide to pass some time in the public sauna, but as you approach, a question surges into your mind. Go naked? Katja is pretty body-conscientious, so maybe going butt-naked isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
+			if sound = 0 and month >= 3 and month < 6:
+				PLAY 'sound/lakeshore1.mp3', 30
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.jpg"></center>'
+			elseif sound = 0 and month >= 6 and month < 9:
+				PLAY 'sound/lakeshore1.mp3', 30
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.jpg"></center>'
+			elseif sound = 0 and month >= 9 and month < 12:
+				PLAY 'sound/lakeshore1.mp3', 30
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.jpg"></center>'
+			end
+			'You decide to spend some time at the secluded beach, but as you approach, a question surges into your mind. Go there naked? Katja is pretty body-conscientious, so... maybe going full nudist isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
 			if func('changingroom','count_swim_item') > 0:
 				act 'Put on your swimwear':
 					*clr & cla
 					if katjaQW['slut'] >= 20 and katjaQW['horny'] >= 20:
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS6.jpg"></center>'
-						'As you prepare to put on your swimwear at the lockers, Katja lies against a wall and observes you undressing. The redhead has stopped midway, and stands there in (sexy) underwear, with eyes full of mischief.'
-						'"Hm. Is something wrong Katja?"'
-						'The ginger just smiles and begins to caress and play with her red mane without breaking eye contact.'
-						'"I... was thinking <<$pcs_nickname>>. Maybe it is better if we go naked, I mean, the hot steam will make us sweat and... my bikini will feel uncomfortable. What do you think? All that sweat all over my skin. It gives you ideas, doesn''t it?"'
-						'Oh fuck! Is she tempting you?'
-						act 'You can''t resist her!':
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL1.jpg"></center>'
+						'As you prepare to change, a long, somewhat husky sigh reaches your ears. It''s come from Katja. She is in her underwear with her eyes closed, the wind playing with her red mane. She is looking sexy as hell.'
+						'"You know <<$pcs_nickname>>, the sun feels nice and there aren''t people around here. So what do you think?"'
+						'It is difficult to link the supposedly timid girl called Ekaterina Meynold with this sensual woman that is trying to tempt you with all her heart (and succeeding) to undress.'
+						'"Think <<$pcs_nickname>>. The water dripping over our naked skin, the wind in our hair and the two of us, all... alone."'
+						'Ok, she is manipulating you. Can you resist the ginger temptress before you?'
+						act 'Of course not!':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL2.jpg"></center>'
 							'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensual eyes.'
 							'"Bitch!"'
-							'You whisper your insult and take the giggling bimbo wannabe towards the sauna.'
-							act 'Go to the sauna':
+							'You verily whisper your insult and take the giggling bimbo wannabe towards the secluded beach.'
+							if PCloSwimwear = 0 and $clothingworntype ! 'none':
+								$lastwornclothingtype['swim'] = $clothingworntype
+								lastwornclothingnumber['swim'] = clothingwornnumber
+								$lastwornpantytype['swim'] = $pantyworntype
+								lastwornpantynumber['swim'] = pantywornnumber
+								$lastwornbratype['swim'] = $braworntype
+								lastwornbranumber['swim'] = brawornnumber
+							end
+							gs 'clothing', 'strip_all'
+							if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+								act 'Swim':
+									gs 'arousal', 'voyeur', 10
+									if pcs_inhib < 20: inhib_exp += 1
+									gt 'katja_lake', 'swim'
+								end
+							end
+							act 'Tan':
+								gs 'arousal', 'voyeur', 10
+								if pcs_inhib < 20: inhib_exp += 1
+								gt 'katja_lake','tan'
+							end
+							act 'Walk':
 								gs 'arousal', 'voyeur', 10
 								if pcs_inhib < 20: inhib_exp += 1
-								gs 'clothing', 'strip_all'
-								gt 'katja_lake','saune_time'
+								gt 'katja_lake','walk'
 							end
 						end
-						gs 'willpower', 'exhib', 'resist', 'hard' & !!This does not take into consideration inhibition/exhibitionism because Sveta chose to put on the swimwear and Katja is forcing her to undress.
+						gs 'willpower', 'exhib', 'resist', 'hard' & !! This does not take into consideration inhibition/exhibitionism because Sveta chose to put on the swimwear and Katja is forcing her to undress.
 						if will_cost <= pcs_willpwr:
-							act 'Resist her!': gt 'katja_lake','sauna_in_swimmwear2'
+							act 'Resist her!': gt 'katja_lake', 'beach_in_swimwear2'
 						else
 							act 'Resist her! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					else
-						gt 'katja_lake','sauna_in_swimmwear1'
-					end
-					if pcs_inhib > 20:
-						act 'Go in the nude!':gs 'clothing', 'strip_all' & gt 'katja_lake','saune_time'
-					end
-					if pcs_inhib < 20:
-						gs 'willpower', 'exhib', 'self', 'easy'
-						if will_cost <= pcs_willpwr:
-							act 'Go in the nude!':
-								*clr & cla
-								gs 'willpower', 'pay', 'selft'
-								gs 'clothing', 'strip_all'
-								if pcs_inhib < 20: inhib_exp += 1
-								gs 'stat'
-								gt 'katja_lake','saune_time'
-							end
-						else
-							act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end
+						gt 'katja_lake', 'beach_in_swimwear1'
 					end
 				end
 			end
 			if pcs_inhib > 20:
-				act 'Go in the nude!':	gs 'clothing', 'strip_all' & gt 'katja_lake','saune_time'
+				act 'Go in the nude!':
+					if PCloSwimwear = 0 and $clothingworntype ! 'none':
+						$lastwornclothingtype['swim'] = $clothingworntype
+						lastwornclothingnumber['swim'] = clothingwornnumber
+						$lastwornpantytype['swim'] = $pantyworntype
+						lastwornpantynumber['swim'] = pantywornnumber
+						$lastwornbratype['swim'] = $braworntype
+						lastwornbranumber['swim'] = brawornnumber
+					end
+					gs 'clothing', 'strip_all'
+					gt 'katja_lake','beach_nude'
+				end
 			elseif pcs_inhib < 20:
 				gs 'willpower', 'exhib', 'self', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Go in the nude!':
 						*clr & cla
 						gs 'willpower', 'pay', 'selft'
+						if PCloSwimwear = 0 and $clothingworntype ! 'none':
+							$lastwornclothingtype['swim'] = $clothingworntype
+							lastwornclothingnumber['swim'] = clothingwornnumber
+							$lastwornpantytype['swim'] = $pantyworntype
+							lastwornpantynumber['swim'] = pantywornnumber
+							$lastwornbratype['swim'] = $braworntype
+							lastwornbranumber['swim'] = brawornnumber
+						end
 						gs 'clothing', 'strip_all'
 						if pcs_inhib < 20: inhib_exp += 1
 						gs 'stat'
-						gt 'katja_lake','saune_time'
+						gt 'katja_lake','beach_nude'
 					end
 				else
 					act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			act 'Hm... it is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
+			act 'Hm... Is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEV','kathan'
 		end
 	end
 end
 
+if $ARGS[0] = 'sauna_time':
+	*clr & cla
+	if sauna_daystart = daystart:
+		'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+		'As you suggest to pass some time in the public sauna, Katja frowns.'
+		'"<<$pcs_nickname>>, spending too much time in there isn''t going to do any good, it is best to leave it for another day."'
+		'It is evident that this isn''t a good idea. You better to look for something else to do.'
+		act 'Continue': gt 'katjaEV','kathan'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
+		'You decide to pass some time in the public sauna, but as you approach, a question surges into your mind. Go naked? Katja is pretty body-conscientious, so maybe going butt-naked isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
+		if func('changingroom','count_swim_item') > 0:
+			act 'Put on your swimwear':
+				*clr & cla
+				if katjaQW['slut'] >= 20 and katjaQW['horny'] >= 20:
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS6.jpg"></center>'
+					'As you prepare to put on your swimwear at the lockers, Katja lies against a wall and observes you undressing. The redhead has stopped midway, and stands there in (sexy) underwear, with eyes full of mischief.'
+					'"Hm. Is something wrong Katja?"'
+					'The ginger just smiles and begins to caress and play with her red mane without breaking eye contact.'
+					'"I... was thinking <<$pcs_nickname>>. Maybe it is better if we go naked, I mean, the hot steam will make us sweat and... my bikini will feel uncomfortable. What do you think? All that sweat all over my skin. It gives you ideas, doesn''t it?"'
+					'Oh fuck! Is she tempting you?'
+					act 'You can''t resist her!':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL2.jpg"></center>'
+						'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensual eyes.'
+						'"Bitch!"'
+						'You whisper your insult and take the giggling bimbo wannabe towards the sauna.'
+						act 'Go to the sauna':
+							gs 'arousal', 'voyeur', 10
+							if pcs_inhib < 20: inhib_exp += 1
+							if PCloSwimwear = 0 and $clothingworntype ! 'none':
+								$lastwornclothingtype['swim'] = $clothingworntype
+								lastwornclothingnumber['swim'] = clothingwornnumber
+								$lastwornpantytype['swim'] = $pantyworntype
+								lastwornpantynumber['swim'] = pantywornnumber
+								$lastwornbratype['swim'] = $braworntype
+								lastwornbranumber['swim'] = brawornnumber
+							end
+							gs 'clothing', 'strip_all'
+							gt 'katja_lake','saune_time'
+						end
+					end
+					gs 'willpower', 'exhib', 'resist', 'hard' & !!This does not take into consideration inhibition/exhibitionism because Sveta chose to put on the swimwear and Katja is forcing her to undress.
+					if will_cost <= pcs_willpwr:
+						act 'Resist her!': gt 'katja_lake','sauna_in_swimmwear2'
+					else
+						act 'Resist her! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				else
+					gt 'katja_lake','sauna_in_swimmwear1'
+				end
+				if pcs_inhib > 20:
+					act 'Go in the nude!':
+						if PCloSwimwear = 0 and $clothingworntype ! 'none':
+							$lastwornclothingtype['swim'] = $clothingworntype
+							lastwornclothingnumber['swim'] = clothingwornnumber
+							$lastwornpantytype['swim'] = $pantyworntype
+							lastwornpantynumber['swim'] = pantywornnumber
+							$lastwornbratype['swim'] = $braworntype
+							lastwornbranumber['swim'] = brawornnumber
+						end
+						gs 'clothing', 'strip_all'
+						gt 'katja_lake','saune_time'
+					end
+				end
+				if pcs_inhib < 20:
+					gs 'willpower', 'exhib', 'self', 'easy'
+					if will_cost <= pcs_willpwr:
+						act 'Go in the nude!':
+							*clr & cla
+							gs 'willpower', 'pay', 'selft'
+							if PCloSwimwear = 0 and $clothingworntype ! 'none':
+								$lastwornclothingtype['swim'] = $clothingworntype
+								lastwornclothingnumber['swim'] = clothingwornnumber
+								$lastwornpantytype['swim'] = $pantyworntype
+								lastwornpantynumber['swim'] = pantywornnumber
+								$lastwornbratype['swim'] = $braworntype
+								lastwornbranumber['swim'] = brawornnumber
+							end
+							gs 'clothing', 'strip_all'
+							if pcs_inhib < 20: inhib_exp += 1
+							gs 'stat'
+							gt 'katja_lake','saune_time'
+						end
+					else
+						act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				end
+			end
+		end
+		if pcs_inhib > 20:
+			act 'Go in the nude!':
+				if PCloSwimwear = 0 and $clothingworntype ! 'none':
+					$lastwornclothingtype['swim'] = $clothingworntype
+					lastwornclothingnumber['swim'] = clothingwornnumber
+					$lastwornpantytype['swim'] = $pantyworntype
+					lastwornpantynumber['swim'] = pantywornnumber
+					$lastwornbratype['swim'] = $braworntype
+					lastwornbranumber['swim'] = brawornnumber
+				end
+				gs 'clothing', 'strip_all'
+				gt 'katja_lake','saune_time'
+			end
+		elseif pcs_inhib < 20:
+			gs 'willpower', 'exhib', 'self', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Go in the nude!':
+					*clr & cla
+					gs 'willpower', 'pay', 'selft'
+					if PCloSwimwear = 0 and $clothingworntype ! 'none':
+						$lastwornclothingtype['swim'] = $clothingworntype
+						lastwornclothingnumber['swim'] = clothingwornnumber
+						$lastwornpantytype['swim'] = $pantyworntype
+						lastwornpantynumber['swim'] = pantywornnumber
+						$lastwornbratype['swim'] = $braworntype
+						lastwornbranumber['swim'] = brawornnumber
+					end
+					gs 'clothing', 'strip_all'
+					if pcs_inhib < 20: inhib_exp += 1
+					gs 'stat'
+					gt 'katja_lake','saune_time'
+				end
+			else
+				act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		end
+		act 'Hm... it is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
+	end
+end
+
 if $ARGS[0] = 'beach_in_swimwear1':
 	*clr & cla
-	if PCloswimwear = 0:
+	if PCloSwimwear = 0 and $clothingworntype ! 'none':
 		minut +=10
 		$loc = 'katja_lake'
 		$loc_arg = 'beach_in_swimwear1'
@@ -499,7 +576,7 @@ if $ARGS[0] = 'playing_in_snow':
 		'Suddenly, a redheaded ghost appears before you from somewhere in the snow-covered landscape and blows some snow in your face, blinding you before sneaking away again.'
 		'"Katja! I swear! No matter if it takes an eternity! YOU WILL BOW DOWN BEFORE ME! BOTH YOU AND THEN ONE DAY... YOUR HEIRS!"'
 		'Her only answer is laughs and a song transported by the wind. Damm, General Snow is on her side, but you will not surrender.'
-		'"NA NA NA NA NA NA NA NA NA NA NA NA NA NA Ekaterina!!!'
+		'"NA NA NA NA NA NA NA NA NA NA NA NA NA NA Ekaterina!!!"'
 		'You engage in a furious snowball battle to see who will be crowned as the new winter queen, at least until the next fight. Ambushes, dirty tricks, fastballs, amazing one-liners, and stealth acts worthy of the Spetsnaz play between you two before you fall laughing into the snow. It seems that today, the battle has ended without a clear winner. Alas, your diversion makes time fly and it is time to look for something else to do.'
 
 		act 'Continue':gt 'katjaEv','kathan'
@@ -632,6 +709,14 @@ if $ARGS[0] = 'beach_nude':
 	end
 	if pcs_inhib < 20: inhib_exp += 1
 	if katjaQW['slut'] <= 20: katjaQW['slut'] += 5
+	if PCloSwimwear = 0 and $clothingworntype ! 'none':
+		$lastwornclothingtype['swim'] = $clothingworntype
+		lastwornclothingnumber['swim'] = clothingwornnumber
+		$lastwornpantytype['swim'] = $pantyworntype
+		lastwornpantynumber['swim'] = pantywornnumber
+		$lastwornbratype['swim'] = $braworntype
+		lastwornbranumber['swim'] = brawornnumber
+	end
 	gs 'clothing', 'strip_all'
 	minut += 10
 	gs 'stat'
@@ -667,7 +752,13 @@ if $ARGS[0] = 'swim':
 		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
 		'"Hm? Oh! True! Let''s go back."'
 
-		act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
+		act 'Redress and return to her home':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'pav_residential'
+		end
 
 	elseif rand(1,20) = 1:
 		gt 'katja_lake','ivan_appeared'
@@ -681,13 +772,19 @@ if $ARGS[0] = 'swim':
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL5.jpg"></center>'
 		'"Ah! This is nice Katja!"'
-		'"Yes, it is. Sometimes you really just want to be alone with a good friend, without peeping toms, judgemental prudes or envious "friends watching you."'
+		'Yes, it is. Sometimes you really just want to be alone with a good friend, without peeping toms, judgemental prudes or envious "friends" watching you.'
 		'The time passes quickly as you both play, enjoying the water and the sun, and little by little you tire until the only you can do is relax, floating on your back. As you lie there rocking slowly over the water, you realize that half an hour of intense water play has passed and you are beginning to wrinkle. It is time to look for something else to do.'
 	end
 
 	act 'Tan': gt 'katja_lake','tan'
 	act 'Walk': gt 'katja_lake','walk'
-	act 'Redress and look for something else to do': gs 'underwear', 'wear'& gs 'clothing', 'wear_last_worn' & minut += 10 & gt 'katjaEv','kathan'
+	act 'Redress and look for something else to do':
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+		minut += 10
+		gt 'katjaEv','kathan'
+	end
 end
 ! tan
 
@@ -701,7 +798,13 @@ if $ARGS[0] = 'tan':
 		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
 		'"Hm? Oh! True! Let''s go back."'
 
-		act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
+		act 'Redress and return to her home':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'pav_residential'
+		end
 
 	elseif rand(1,20) = 1:
 		gt 'katja_lake','ivan_appeared'
@@ -731,7 +834,13 @@ if $ARGS[0] = 'tan':
 		act 'Swim': gt 'katja_lake','swim'
 	end
 	act 'Walk': gt 'katja_lake','walk'
-	act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+	act 'Redress and look for something else to do':
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+		minut += 10
+		gt 'katjaEv','kathan'
+	end
 end
 
 ! walk
@@ -744,7 +853,13 @@ if $ARGS[0] = 'walk':
 		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
 		'"Hm? Oh! True! Let''s go back."'
 
-		act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
+		act 'Redress and return to her home':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'pav_residential'
+		end
 
 	elseif rand(1,20) = 1:
 		gt 'katja_lake','ivan_appeared'
@@ -770,7 +885,13 @@ if $ARGS[0] = 'walk':
 		act 'Swim': gt 'katja_lake','swim'
 	end
 	act 'Tan': gt 'katja_lake','tan'
-	act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+	act 'Redress and look for something else to do':
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+		minut += 10
+		gt 'katjaEv','kathan'
+	end
 end
 
 ! Ivan appeared
@@ -804,7 +925,13 @@ if $ARGS[0] = 'ivan_appeared':
 			npc_rel['A14'] += 1
 			gs 'stat'
 
-			act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+			act 'Redress and look for something else to do':
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+				minut += 10
+				gt 'katjaEv','kathan'
+			end
 
 			if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
 				act 'Swim': gt 'katja_lake','swim'
@@ -907,7 +1034,13 @@ if $ARGS[0] = 'ivan_interaction':
 		end
 		act 'Tan':gt 'katja_lake','tan'
 		act 'Walk':gt 'katja_lake','walk'
-		act 'Redress and look for something else to do':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+		act 'Redress and look for something else to do':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'katjaEv','kathan'
+		end
 
 		if IvanShowerQW = 11 and fame['pav_slut'] <250 and katjaQW['horny'] >60 and katjaQW['anal_quest'] >= 2 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] = 0:
 			act '"Hey Ivan! You know, we are REALLY bored!"':
@@ -1037,7 +1170,13 @@ if $ARGS[0] = 'ivan_interaction':
 										'You get up and embrace the ginger before deciding to redress, as Katja seems pretty wasted and it is best to take her home.'
 									end
 
-									act 'Redress and take Katja to her home':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
+									act 'Redress and take Katja to her home':
+										gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+										gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+										gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+										minut += 10
+										gt 'pav_residential'
+									end
 								end
 							end
 						end
@@ -1136,7 +1275,13 @@ if $ARGS[0] = 'ivan_interaction':
 									'"Shit <<$pcs_nickname>>! We truly are a pair of sluts!"'
 									'You lie by her side and give the redhead another cum-soaked kiss, before getting up and deciding to redress. That was fun, but it is time to look for something else to do.'
 
-									act 'Redress and look for something else to do':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+									act 'Redress and look for something else to do':
+										gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+										gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+										gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+										minut += 10
+										gt 'katjaEv','kathan'
+									end
 								end
 							end
 						end
@@ -1196,7 +1341,13 @@ if $ARGS[0] = 'saune_time':
 				end
 			end
 
-			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & minut += 10 & gt 'katjaEv','kathan'
+			act 'Shower, redress and go':
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+				minut += 10 & minut += 10
+				gt 'katjaEv','kathan'
+			end
 
 		elseif katjaQW['slut'] >= 20:
 			'After undressing in the lockers, and waiting for your turn, Katja and you enter the sauna. You sit completely naked, neither you nor Katja being ashamed to show your beautiful bodies and letting the hot and humid air smooth your precious skins.'
@@ -1219,7 +1370,13 @@ if $ARGS[0] = 'saune_time':
 					act 'Ice dipping! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & minut += 10 & gt 'katjaEv','kathan'
+			act 'Shower, redress and go':
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+				minut += 10 & minut += 10
+				gt 'katjaEv','kathan'
+			end
 
 		else
 			'You both change in the lockers, but before Katja can put on her bikini, you grab it.'
@@ -1248,7 +1405,14 @@ if $ARGS[0] = 'saune_time':
 				end
 			end
 
-			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & katjaQW['slut'] +=5 & minut += 10 & gt 'katjaEv','kathan'
+			act 'Shower, redress and go':
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+				katjaQW['slut'] +=5
+				minut += 10
+				gt 'katjaEv','kathan'
+			end
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS7.jpg"></center>'
@@ -1271,7 +1435,13 @@ if $ARGS[0] = 'saune_time':
 				act 'Ice dipping! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Shower, redress and go':minut += 10 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gt 'katjaEv','kathan'
+		act 'Shower, redress and go':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'katjaEv','kathan'
+		end
 	end
 end
 
@@ -1286,8 +1456,9 @@ if $ARGS[0] = 'ice_dipping':
 
 	if $clothingworntype = 'nude':
 		inhib_exp += rand(1,2)
-		gs 'clothing', 'wear_last_worn'
-		gs 'underwear', 'wear'
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS13.jpg"></center>'
 		'Grabbing Katja''s hand, you run naked out of the sauna and jump into the lake''s icy waters, the sudden cold shock toning your bodies.'
 		'"Yuhu! Katja! One for pavlovsk''s alpha bitches!"'
@@ -1302,7 +1473,13 @@ if $ARGS[0] = 'ice_dipping':
 		'"Fuck fukity fuck <<$pcs_nickname>>! Two for the Pavlovsk''s alpha bitches!"'
 		'Finally, trembling but happy, you both exit the water and proceed to do some warm-ups. It has been fun, but it is time to look for something else to do.'
 	end
-	act 'Shower, redress and go':minut += 10 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gt 'katjaEv','kathan'
+	act 'Shower, redress and go':
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+		minut += 10
+		gt 'katjaEv','kathan'
+	end
 end
 
 if $ARGS[0] = 'sauna_sex1':
@@ -1458,7 +1635,13 @@ if $ARGS[0] = 'sauna_sex2':
 			end
 		end
 
-		act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+		act 'Shower, redress and go':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'katjaEv','kathan'
+		end
 	end
 end
 

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/komp_camgirl.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = 'startpage':
 		'While you sit in your chair, you can''t help but wince every time you move. You want to put up a show, but it hurts too much. And besides... you doubt your viewers would want to see you in your current state! You should heal up a bit before trying again.'
 		act 'Collect your earnings and leave':
 			karta += tokenpay
-			tokens = 0
+			tokenpay = 0
 			gt 'komp_camgirl','start'
 		end
 	else
@@ -88,7 +88,7 @@ if $ARGS[0] = 'startpage':
 		act 'Turn on your webcam': gt 'komp_camgirl','waitclients'
 		act 'Collect your earnings and leave':
 			karta += tokenpay
-			tokens = 0
+			tokenpay = 0
 			gt 'komp_camgirl','start'
 		end
 	end

locations/komp_lonely_fans.qsrc

@@ -0,0 +1,13 @@
+# komp_lonely_fans
+
+if $ARGS[0] = 'main':
+	'<center><b>Lonely Fans</b></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	
+	act 'Close Lonely Fans': gt 'komp', 'browse'
+end
+
+
+
+
+--- komp_lonely_fans ---------------------------------

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/lesbidomhouse.qsrc

@@ -1294,26 +1294,26 @@ if $ARGS[0] = 'QW10a':
 		'She then shows him the door, and you swear she looks pleased with herself when she walks away. You can''t help but slowly wiggle in your tight binds, trying to get off by using the friction of the rope for stimulation. Mistress made sure that doesn''t work, but enjoys watching you try when she walks by at one point. You''re left feeling very aroused by the time she comes to see you again.'
 		gs 'arousal', 'foreplay', 75, 'sub', 'bound', 'exhibitionism'
 		gs 'stat'
-		temp = rand(0,1)
-		
-		if temp = 1:
-			act 'Lick Mistress'' pussy':
-				*clr & cla
-				MistressAdoration += 2
-				gs'stat'
 
-				'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub24.jpg"></center>'
-				'You recognize that wolfish look in her eyes as she unties the long ends of the rope.'
-				'Automatically dropping to your knees, you eagerly bury your face in your Mistress'' snatch and eagerly lick up her juices. Your bonds make you feel like she is challenging you, and you do your absolute best to please her with only your mouth. When she cums with your tongue inside her pussy, you feel very proud and incredibly horny.'
-				gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian', 'bound'
-				gs 'arousal', 'end'
-				gs 'stat'
-		
-				act 'Get dressed and leave':gt'city_residential'
-			end
-		else
+		act 'Lick Mistress'' pussy when she unties you':
+			*clr & cla
+			MistressAdoration += 2
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub24.jpg"></center>'
+			'You recognize that wolfish look in her eyes as she unties the long ends of the rope.'
+			'Automatically dropping to your knees, you eagerly bury your face in your Mistress'' snatch and eagerly lick up her juices. Your bonds make you feel like she is challenging you, and you do your absolute best to please her with only your mouth. When she cums with your tongue inside her pussy, you feel very proud and incredibly horny.'
+			gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian', 'bound'
+			gs 'arousal', 'end'
+			gs 'stat'
+	
 			act 'Get dressed and leave':gt'city_residential'
 		end
+		act 'Get dressed as soon as you are free and leave':
+			gs 'arousal', 'end'
+			gs 'stat'
+			gt'city_residential'
+		end
 	else
 		if analplugin = 1:
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub21.jpg"></center>'
@@ -1326,33 +1326,33 @@ if $ARGS[0] = 'QW10a':
 		
 		if analplugin = 1:'You wiggle your ass with your butt plug for her whenever she''s looking at it, and actually make her laugh. "You really like putting things up your ass and acting like a pet, don''t you slave?" she smiles. "Perhaps I should get you one of those tail plugs, so you really look the part."'
 		'When Mistress removes your collar at the end of the hour, you''re actually a bit sad that it''s over. You were having so much fun!'
+		'"You''ve been very good today so I will give you a choice, you can get dress and leave or you can stay a bit longer and thank your mistress. This is not a test, there is no wrong answer."'
 		gs 'arousal', 'foreplay', 70, 'sub'
 		gs 'stat'
-		temp = rand(0,2)
-		
-		if temp = 1:
-			act 'Lick Mistress'' pussy':
-				*clr & cla
-				MistressAdoration += 2
-				gs'stat'
+		act 'Stay and thank your Mistress':
+			*clr & cla
+			MistressAdoration += 2
+			gs'stat'
 
-				'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub24.jpg"></center>'
-				'Just when you expect Mistress to tell you to get dressed and leave, she tells you to stand and wait before leaving the room. She comes back after a while, completely naked as well. She looks at you playfully, and deftly binds you in a simple rope harness and secures your arms behind your back.'
-				'"You''ve been such a good slave today," she says encouragingly. "I''m going to give you a chance to show your Mistress how devoted you are to her."'
-				'With zero hesitation, you drop to your knees and grind your tongue against her cunt, lapping up her sweet juices. Mistress was incredibly horny already when she was lecturing you on pet behaviour, and the eagerness with which you do whatever she says pleases her greatly. In no time at all, she shoves her pussy against your mouth and squirts a little as she has a thunderous orgasm.'
-				*nl
-				'You catch yourself rubbing your thighs together in an attempt to stimulate yourself, but reluctantly stop. You were close, but you don''t want to ruin the great mood Mistress is in by cumming without her permission.'
-				'Mistress caresses your scalp for a second before snapping back into her regular role as she undoes your binds. "You know the drill, slave. Get dressed in the hallway and find your own way out." When she spots her juices on your chin and breasts, she grins. "Oh... and leave that on."'
-				'You blush a little as you get dressed before leaving.'
-				gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian'
-				gs 'arousal', 'end'
-				gs 'stat'
-				
-				act 'Get dressed and leave':gt'city_residential'
-			end
-		else
+			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub24.jpg"></center>'
+			'Just when you expect Mistress to tell you to get dressed and leave, she tells you to stand and wait before leaving the room. She comes back after a while, completely naked as well. She looks at you playfully, and deftly binds you in a simple rope harness and secures your arms behind your back.'
+			'"You''ve been such a good slave today," she says encouragingly. "I''m going to give you a chance to show your Mistress how devoted you are to her."'
+			'With zero hesitation, you drop to your knees and grind your tongue against her cunt, lapping up her sweet juices. Mistress was incredibly horny already when she was lecturing you on pet behaviour, and the eagerness with which you do whatever she says pleases her greatly. In no time at all, she shoves her pussy against your mouth and squirts a little as she has a thunderous orgasm.'
+			*nl
+			'You catch yourself rubbing your thighs together in an attempt to stimulate yourself, but reluctantly stop. You were close, but you don''t want to ruin the great mood Mistress is in by cumming without her permission.'
+			'Mistress caresses your scalp for a second before snapping back into her regular role as she undoes your binds. "You know the drill, slave. Get dressed in the hallway and find your own way out." When she spots her juices on your chin and breasts, she grins. "Oh... and leave that on."'
+			'You blush a little as you get dressed before leaving.'
+			gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian'
+			gs 'arousal', 'end'
+			gs 'stat'
+			
 			act 'Get dressed and leave':gt'city_residential'
 		end
+		act 'Get dressed and leave':
+			gs 'arousal', 'end'
+			gs 'stat'
+			gt'city_residential'
+		end
 	end
 end
 

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/miroslave_schedule.qsrc

@@ -0,0 +1,173 @@
+# miroslave_schedule
+
+	!MiraLoc tells us where Mira is Located
+	!----------------------------------------------
+	!MiraLoc = 0	(Mira at home)		-> locat['A60'] = 0
+	!MiraLoc = 1	(Mira at river)		-> locat['A60'] = 1
+	!MiraLoc = 2	(Mira at meadow)	-> locat['A60'] = 2
+	!MiraLoc = 3	(Mira at forest)	-> locat['A60'] = 3
+	!MiraLoc = 4	(Mira at field)		-> locat['A60'] = 4
+	!MiraLoc = 41	(Mira at field)		-> locat['A60'] = 41
+	!MiraLoc = 42	(Mira at field)		-> locat['A60'] = 42
+	!MiraLoc = 43	(Mira at field)		-> locat['A60'] = 43
+	!MiraLoc = 5	(Mira with gop)		-> locat['A60'] = 5
+	!MiraLoc = 6	(Mira at Gadhouse)	-> locat['A60'] = 6
+	!MiraLoc = 7	(Mira at Gaddvor)	-> locat['A60'] = 7
+	!MiraLoc = 8	(Mira at highway)	-> locat['A60'] = 8
+	!MiraLoc = 9	(Mira with Sveta)	-> locat['A60'] = 9
+	
+	!! NEW
+	!locat['A60'] = 0	Home
+	!locat['A60'] = 1	Gad
+	!locat['A60'] = 2	River
+	!locat['A60'] = 3	Forest
+	!locat['A60'] = 31	Meadow
+	!locat['A60'] = 4	Field
+	!locat['A60'] = 41	Field
+	!locat['A60'] = 42	Field
+	!locat['A60'] = 43	Field
+	!locat['A60'] = 5	Gopniks
+	!locat['A60'] = 6	Grandparents house
+	!locat['A60'] = 61	Grandparents yard
+	!locat['A60'] = 7	Highway
+	!locat['A60'] = 9	With Sveta
+
+
+
+!! Cikl: mira_sched = rand(0, 3)
+
+if MiraLoc = 9:
+	!! If Mira is with you, she''ll stick with you.
+	MiraLoc = 9
+else
+	!! From mirafather and miroslavahome
+	if mira_no > 0:
+		locat['A60'] = 0
+	else
+		if sunWeather = 0:
+			if npc_rel['A60'] >= 15:
+				if mira_sched = 1:
+					locat['A60'] = 6
+				else
+					locat['A60'] = 0
+				end
+			else
+				MiraLoc = 0
+			end
+			!!Or MiraLoc = 6?
+		else
+			if hour < 8:
+				locat['A60'] = 0
+			elseif hour >= 20:
+				if npc_rel['A60'] >= "SOMETHING":
+					locat['A60'] = 5
+				else
+					locat['A60'] = 0
+				end
+			else
+				if mira_shed = 1:
+					!!			8-10,	10-12,	12-14,	14-16,	16-18,	18-20
+					!! Sched0: 	River,	River,	Forest,	Meadow,	River,	home
+					if hour < 10:
+						locat['A60'] = 2
+					elseif hour < 12:
+						locat['A60'] = 2
+					elseif hour < 14:
+						locat['A60'] = 3
+					elseif hour < 16:
+						locat['A60'] = 31
+					elseif hour < 18:
+						locat['A60'] = 2
+					else
+						locat['A60'] = 0
+					end
+				elseif mira_shed = 2:
+				
+				end
+			end
+		end
+
+		if npc_QW['A60'] > 15 and hour >= 16 and hour <= 19:
+			locat['A60'] = 8
+		elseif locat['A60'] ! 0:
+			if npc_rel['A60'] = 0:
+				locat['A60'] = 1
+			else
+				if month >= 4 and month <= 10 and hour >= 8 and hour <= 18:
+					locat['A60'] = 1
+				elseif hour >= 8 and hour <= 22:
+					locat['A60'] = 0
+				end
+			end
+		end
+	end
+end
+
+
+!New
+if $ARGS[0] = 'getLocation':
+	if locat['A60'] = 0:
+		$npcLocation['A60'] = 'Mira is at home'
+	elseif locat['A60'] = 1:
+		$npcLocation['A60'] = 'Mira is walking around Gad'
+	elseif locat['A60'] = 2:
+		$npcLocation['A60'] = 'Mira is at the river'
+	elseif locat['A60'] = 3:
+		$npcLocation['A60'] = 'Mira is at forest'
+	elseif locat['A60'] = 31:
+		$npcLocation['A60'] = 'Mira is at the meadow'
+	elseif locat['A60'] = 4:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 41:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 42:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 43:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 5:
+		$npcLocation['A60'] = 'Mira is with gopniks'
+	elseif locat['A60'] = 6:
+		$npcLocation['A60'] = 'Mira is at your Grandparents house'
+	elseif locat['A60'] = 61:
+		$npcLocation['A60'] = 'Mira is in your Grandparents yard'
+	elseif locat['A60'] = 7:
+		$npcLocation['A60'] = 'Mira is at the highway'
+	elseif locat['A60'] = 9:
+		$npcLocation['A60'] = 'Mira is with you'
+	end
+end
+
+
+!{!OLD
+if $ARGS[0] = 'getLocation':
+	if locat['A60'] = 0:
+		$npcLocation['A60'] = 'Mira is at home'
+	elseif locat['A60'] = 1:
+		$npcLocation['A60'] = 'Mira is at river'
+	elseif locat['A60'] = 2:
+		$npcLocation['A60'] = 'Mira is at meadow'
+	elseif locat['A60'] = 3:
+		$npcLocation['A60'] = 'Mira is at forest'
+	elseif locat['A60'] = 4:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 41:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 42:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 43:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 5:
+		$npcLocation['A60'] = 'Mira is at gop'
+	elseif locat['A60'] = 6:
+		$npcLocation['A60'] = 'Mira is at gadhouse'
+	elseif locat['A60'] = 7:
+		$npcLocation['A60'] = 'Mira is at gaddvor'
+	elseif locat['A60'] = 8:
+		$npcLocation['A60'] = 'Mira is at the highway'
+	elseif locat['A60'] = 9:
+		$npcLocation['A60'] = 'Mira is with you'
+	end
+end
+}
+
+--- miroslave_schedule ---------------------------------

locations/mother.qsrc

@@ -288,8 +288,9 @@ if $ARGS[0] = '':
 		end
       
 		!!Tell mother that you were raped and skip mother being angry at you for being sexualy active event
-		if motherKnowRaped = 0 and (rape > 0 or hidden_rape > 0):
+		if rape_count > motherKnowRaped:
 			act 'Tell her about your rape':
+				motherKnowRaped = rape_count
 				gt 'mother_chats', 'rape_talk'
 			end
 		end
@@ -1959,6 +1960,7 @@ if $ARGS[0] = 'dildo_find':
 	killvar 'mom_found_dildo_variable'
 	!! Effectively blocks this from happening again... can be changed if a 'repeat' version of this scene is ever written
 	motherQW['seen_dildos'] = 1
+	motherKnowDildo = 1
 	gs 'stat'
 	!! TEMPORARY PICTURE
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
@@ -1973,7 +1975,7 @@ if $ARGS[0] = 'dildo_find':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'You look at her with a firm look. "I bought it with my own money."'
 		'She looks at you in confusion. "Why would you ever want to spend your money on something like this?"'
-		if mom_dildo = 1:
+		if selfmomtoyplay = 1:
 			'"I don''t know, I saw that you had one and wanted to have one of my own..." you try to explain.'
 			'Your <<$npc_nickname[''A29'']>> walks up to you and starts brushing your hair. "You''re aware this is for adults only, right? It''s not something that you should be owning. You''re still too young for this..."'
 		else

locations/mother_chats.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'rape_talk':
 	*clr & cla
 	minut += 5
+	if motherKnowSpravka = 0: motherKnowSpravka = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/hug_sad1.jpg"></center>'
 	'"<<$npc_nickname[''A29'']>>..." you say to get her attention. However, before she can respond or even turn to look at you, the emotions and trauma take over. "I''ve been raped!" You barely manage to say it before the flood gates open and you''re sobbing in front of her.'
@@ -100,7 +101,6 @@ if $ARGS[0] = 'rape_talk':
 							pcs_hydra += 60
 						end
 						pcs_willpwr += 5
-						motherKnowSpravka = 1
 						minut += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'

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

@@ -30,90 +30,7 @@ if $ARGS[0] = 'chat':
 	if NatbelQW['FriendLover'] > 2: gs 'natbel_chat', 'lover_chat'
 end
 
-if $ARGS[0] = 'preg_chat':
-	if npc_pregtalk['A16'] = 0 and kid = 0:
-		if NatbelQW['pregday'] > 0 and (daystart-NatbelQW['pregday']) > 90 and (daystart-NatbelQW['pregday']) < 200 and func('body_din','pregnancyVisibility') = 1:
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
-			'"<<$pcs_nickname>>, are you pregnant, too? Well, I guess I don''t have to worry about being the only pregnant girl at school," she giggles.'
-
-			act 'Continue':gt 'natbel_chat', 'natknows'
-		elseif NatbelQW['pregday'] > 0 and (daystart-NatbelQW['pregday']) > 90 and (daystart-NatbelQW['pregday']) < 200 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
-			act 'Tell her you''re pregnant':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
-				'"If you were worried about being the only pregnant girl at school, that won''t be a problem anymore." You smirk while rubbing your midriff. "It looks like I got myself knocked up as well."'
-				'Natasha smiles at you excitedly. "Really? Congratulations!"'
-
-				act 'Continue':gt 'natbel_chat', 'natknows'
-			end
-		elseif NatbelQW['QWstage'] <= 5 and pregchem > 0 and knowpreg = 1:
-			act 'Tell her you''re pregnant':
-				npc_pregtalk['A16'] = 1
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
-				'"<<$pcs_nickname>>, you''re," she pauses momentarily before continuing in a tone of shock mixed with disgust, "pregnant? Have you been sleeping around? This will definitely impact your studies."'
 
-				act 'Continue' :gt 'natbelapt', 'natroom'
-			end
-		elseif pregchem > 0 and knowpreg = 1:
-			act 'Tell her you''re pregnant':
-				npc_pregtalk['A16'] = 1
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
-				'"You''re pregnant? Who''s the father?"'
-				if $wombthfath = '' or $wombthfathID = 'unknown':
-					'"Honestly, I don''t even know."'
-					'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
-
-					act 'Continue' :gt 'natbelapt', 'natroom'
-				else
-					'You tell her that <<$wombthfath>> is the father and then give her brief details as to how you got pregnant, without getting too explicit.'
-					'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
-
-					act 'Continue' :gt 'natbelapt', 'natroom'
-				end
-			end
-		end
-	end
-
-	if npc_pregtalk['A16'] = 0 and kid > 0:
-		if (NatbelQW['pregday'] > 0 and (daystart-NatbelQW['pregday']) > 90 and (daystart-NatbelQW['pregday'])< 200) or (NatbelQW['babycount'] > 0) and func('body_din','pregnancyVisibility') = 1:
-			*clr & cla
-			
-			'"Wow, <<$pcs_nickname>>, you''re pregnant again? You''re really committed to making sure I''m not the only young mother around here, huh?" She playfully smiles and puts a hand on your shoulder. "It''s good to know you''re looking out for me."'
-
-			act 'Next':gt 'natbel_chat', 'natknows1'
-		elseif (NatbelQW['pregday'] > 0 and (daystart-NatbelQW['pregday']) > 90 and (daystart-NatbelQW['pregday'])< 200) or (NatbelQW['babycount'] > 0) and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
-			act 'Tell her you''re pregnant':
-				*clr & cla
-				
-				'"Hey, guess who''s pregnant again. You know, I''m glad I forced you to let Kolka impregnate you so that I could have someone I can relate to."'
-				'Natasha stares at you for a moment, stunned, trying to determine if the second half of your statement was a joke, before the first half clicks in her mind. "Oh my God, that''s wonderful!" she exclaims as she throws her arms around you and hugs you. When she finally lets go, she asks'
-
-				act 'Next':gt 'natbel_chat', 'natknows1'
-			end
-		elseif NatbelQW['QWstage'] <= 5 and pregchem > 0 and knowpreg = 1:
-			act 'Tell her you''re pregnant':
-				npc_pregtalk['A16'] = 1
-				*clr & cla
-				
-				'"Really? You''re pregnant again? You should really try to be more careful."'
-
-				act 'Continue' :gt 'natbelapt', 'natroom'
-			end
-		elseif pregchem > 0 and knowpreg = 1:
-			act 'Tell her you''re pregnant':
-				npc_pregtalk['A16'] = 1
-				*clr & cla
-				
-				'"You got pregnant again. It must be wonderful…" She trails off, clearly envious.'
-
-				act 'Continue' :gt 'natbelapt', 'natroom'
-			end
-		end
-	end
-end
 
 if $ARGS[0] = 'events_chat':
 	act 'Talk about events':
@@ -133,6 +50,8 @@ if $ARGS[0] = 'events_chat':
 	end
 end
 
+	!! ---- LOAN and DEBT CHATS ---- !!
+
 if $ARGS[0] = 'loan_events_chat':
 	if NatbelQW['Debt'] > 0:
 		if NatbelQW['DebtDay'] > daystart:
@@ -142,64 +61,12 @@ if $ARGS[0] = 'loan_events_chat':
 			act 'Stop talking': gt 'natbelapt', 'natroom'
 		else
 			'Natasha looks at the floor, "<<$pcs_nickname>>, I... I''m sorry, I don''t have your money."'
-			if NatbelQW['QWstage'] = 2:
-				act 'Demand repayment':
-					NatbelQW['QWstage'] = 3
-					minut += 5
-					gs 'stat'
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
-					'You decide not to reduce Natasha''s debt. You angrily confront her, demanding that she return the money to you, one way or another. Natasha curls up into a ball on her bed: "<<$pcs_nickname>>, I''m so sorry! I will do anything you say! Anything!"'
-					*nl
-					'Natasha looks at you with fearful eyes, and you''re getting some ideas as to how you could "use" her. She did say "anything," after all...'
-					'You snarl at her with an evil hiss: "You''ll be my little pet until you''ve worked off every last Kopeck. And don''t you dare tell anyone about this!"'
-					'You give her a soft slap on the cheek to test your newfound power over her rather than to hurt her, but she flinches and nods profusely. Looks like you''ve got your own little slave now.'
-					if lernHome > 0:
-						gs 'natbel_cp_1', 'make_her_do_homework'
-					else
-						*clr & cla
-						minut += 60
-						menu_off = 1
-						NatbelQW['homework'] += 1
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/study.jpg"></center>'
-						'Natasha sighs with a resigned look as she nods meekly.'
-						'"I should make you do my homework but I''ve already done it, so instead you can write out some lines for me. Write ''I will do as <<$pcs_firstname>> tells me'' one thousand times."'
-						'You relax on her bed and start daydreaming for a while.'
-						'You are woken out of your daydream by Natasha saying: "It''s done <<$pcs_nickname>>."'
-						'"Good, let me have a look at it."'
-						'You tear the paper up and throw the pieces in the bin.'
-						act 'Let''s hope she learned her lesson': gt 'natbelapt', 'natroom'
-					end
-				end
-			else
-				act 'Demand repayment':
-					minut += 5
-					gs 'stat'
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
-					if NatbelQW['MoneyGivenTimes'] < 4:
-						'You decide not to reduce Natasha''s debt. You angrily confront her, demanding that she return the money to you, one way or another. Natasha curls up into a ball on her bed: "<<$pcs_nickname>>, I''m so sorry! I will do anything you say! Anything!"'
-						*nl
-						'Natasha looks at you with fearful eyes, and you are getting some more ideas as to how you could "use" her this time. She did say "anything," after all...'
-						'You snarl at her with an evil hiss: "You''ll be my little pet again until you''ve worked off every last Kopeck. And don''t you dare tell anyone about this!"'
-						'You give her a soft slap on the cheek to test your newfound power over her rather than to hurt her, but she flinches and nods profusely. Looks like you''ve got your own little slave now.'
-
-						act 'Keep talking': gt 'natbel_chat', 'chat'
-						act 'Stop talking': gt 'natbelapt', 'natroom'
-					else
-						'"Well, you did agree to be my toy again if you couldn''t pay me back. I guess we''re going to have some more fun very soon Natasha."'
-
-						act 'Keep talking': gt 'natbel_chat', 'chat'
-						act 'Stop talking': gt 'natbelapt', 'natroom'
-					end
-				end
-			end
+			gs 'natbel_chat', 'demand_debt_repayment'
 			gs 'natbel_chat', 'debt_forgive'
 		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."'
@@ -269,6 +136,62 @@ if $ARGS[0] = 'loan_events_chat':
 	end
 end
 
+if $ARGS[0] = 'demand_debt_repayment':
+	if NatbelQW['QWstage'] = 2:
+		act 'Demand repayment':
+			NatbelQW['QWstage'] = 3
+			minut += 5
+			gs 'stat'
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
+			'You decide not to reduce Natasha''s debt. You angrily confront her, demanding that she return the money to you, one way or another. Natasha curls up into a ball on her bed: "<<$pcs_nickname>>, I''m so sorry! I will do anything you say! Anything!"'
+			*nl
+			'Natasha looks at you with fearful eyes, and you''re getting some ideas as to how you could "use" her. She did say "anything," after all...'
+			'You snarl at her with an evil hiss: "You''ll be my little pet until you''ve worked off every last Kopeck. And don''t you dare tell anyone about this!"'
+			'You give her a soft slap on the cheek to test your newfound power over her rather than to hurt her, but she flinches and nods profusely. Looks like you''ve got your own little slave now.'
+			if lernHome > 0:
+				gs 'natbel_cp_1', 'make_her_do_homework'
+			else
+				*clr & cla
+				minut += 60
+				menu_off = 1
+				NatbelQW['homework'] += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/study.jpg"></center>'
+				'Natasha sighs with a resigned look as she nods meekly.'
+				'"I should make you do my homework but I''ve already done it, so instead you can write out some lines for me. Write ''I will do as <<$pcs_firstname>> tells me'' one thousand times."'
+				'You relax on her bed and start daydreaming for a while.'
+				'You are woken out of your daydream by Natasha saying: "It''s done <<$pcs_nickname>>."'
+				'"Good, let me have a look at it."'
+				'You tear the paper up and throw the pieces in the bin.'
+				act 'Let''s hope she learned her lesson': gt 'natbelapt', 'natroom'
+			end
+		end
+	else
+		act 'Demand repayment':
+			minut += 5
+			gs 'stat'
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
+			if NatbelQW['MoneyGivenTimes'] < 4:
+				'You decide not to reduce Natasha''s debt. You angrily confront her, demanding that she return the money to you, one way or another. Natasha curls up into a ball on her bed: "<<$pcs_nickname>>, I''m so sorry! I will do anything you say! Anything!"'
+				*nl
+				'Natasha looks at you with fearful eyes, and you are getting some more ideas as to how you could "use" her this time. She did say "anything," after all...'
+				'You snarl at her with an evil hiss: "You''ll be my little pet again until you''ve worked off every last Kopeck. And don''t you dare tell anyone about this!"'
+				'You give her a soft slap on the cheek to test your newfound power over her rather than to hurt her, but she flinches and nods profusely. Looks like you''ve got your own little slave now.'
+
+				act 'Keep talking': gt 'natbel_chat', 'chat'
+				act 'Stop talking': gt 'natbelapt', 'natroom'
+			else
+				'"Well, you did agree to be my toy again if you couldn''t pay me back. I guess we''re going to have some more fun very soon Natasha."'
+
+				act 'Keep talking': gt 'natbel_chat', 'chat'
+				act 'Stop talking': gt 'natbelapt', 'natroom'
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'forgive_chat':
 	'You take a moment to consider Natasha''s request as you''ve already lent her 5,000 roubles which she couldn''t repay leading to you forgiving the debt as she''s a good friend and you didn''t want to impose penalty conditions on her.'
 	'Although you consider her a very good friend you are concerned that she won''t be able to repay this loan either so you weigh up your options.'
@@ -322,6 +245,170 @@ if $ARGS[0] = 'forgive_chat2':
 	end
 end
 
+if $ARGS[0] = 'debt_forgive':
+	if NatbelQW['Debt'] > 0 and NatbelQW['DebtDay'] <= daystart:
+		if NatbelQW['QWstage'] = 2:
+			act 'Forgive Natasha''s debt':
+				NatbelQW['Debt'] = 0
+				NatbelQW['DebtDay'] = 0
+				NatbelQW['DebtForgiven'] = 1
+				gs 'npc_relationship', 'modify', 'A16', 'adore'
+				minut += 5
+				gs 'stat'
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha1.jpg"></center>'
+				'You look at her and it is clear that she is close to tears, probably having feared the worst. Feeling for her, you try to comfort her, "Come on, Natasha. Did you really think I expected you to be able to repay me? I... hear about the gossip at school. You''ve been a good friend to me and helped me with my homework when I was struggling, so let me help you too."'
+				'Overcome with relief, Natasha starts sobbing. "I''m just so grateful. I really didn''t expect you to do that. I really want to repay you, however I can."'
+				'You lift up her chin, kiss her on the cheek and give her a big hug. "Let''s see where our journey takes us," you say to her as her tears subside.'
+				act 'Keep talking': gt 'natbel_chat', 'chat'
+				act 'Stop talking': gt 'natbelapt', 'natroom'
+				act 'Ask her about what she bought <br><font color="red">This option will block the Natasha submissive path.</font>':
+					gt 'natbel_chat', 'debt_forgive2'
+				end
+			end
+		else
+			act 'Forgive Natasha''s debt':
+				NatbelQW['Debt'] = 0
+				NatbelQW['DebtDay'] = 0
+				NatbelQW['DebtForgiven'] += 1
+				minut += 5
+				gs 'stat'
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha1.jpg"></center>'
+				'You decide to forgive Natasha''s debt. She is delighted and thanks you with all her heart.'
+
+				act 'Keep talking': gt 'natbel_chat', 'chat'
+				act 'Stop talking': gt 'natbelapt', 'natroom'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'debt_forgive2':
+	*clr & cla
+	menu_off = 1
+	NatbelQW['FriendLover'] = 1
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha1.jpg"></center>'
+	'"So Natasha, do you want to show me what you bought with the money I lent you? I''ve been looking forward to seeing it."'
+	'Natasha looks worried again and with a very croaky voice replies, "I''m sorry <<$pcs_nickname>>, I didn''t manage to get anything!"'
+	'You are a bit confused. "Sorry, Natasha. I gave you five thousand rubles! I thought you could treat yourself to a new outfit or two?"'
+	'The girl can''t hold back her tears and starts sobbing again. A little exasperated, you give her another hug. "Look, Natasha. Please stop crying. I''m not mad at you, I just want to know what happened. You''re my friend and I want to help if I can."'
+	'Natasha responds, "You''ve already helped me more than I could imagine. I couldn''t hope for more."'
+	'"Look, enough with the tears and the apologies. Please, just tell me."'
+	'Natasha looks at you and is clearly worried. She takes a deep breath, "I had a few debts I had to repay as I was getting chased and then I had to help my mum so there''s nothing left..."'
+	'You nod your head, "Right, okay. So did you get all your debts repaid?"'
+	'She shakes her head. "No. I still owe Christina 500 rubles."'
+	'"And that''s the last debt you owe?" you ask her.'
+	'"Yeah, that''s the last one."'
+	act 'Let her deal with the last debt':
+		*clr & cla
+		NatbelQW['chrispaid'] = 1
+		NatbelQW['evt_day'] = daystart
+		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha2.jpg"></center>'
+		'"Okay, well, that''s not too bad. I think you can handle that one by yourself," you say.'
+		'She nods her head slowly.'
+		act 'Keep talking': gt 'natbel_chat', 'chat'
+		act 'Stop talking': gt 'natbelapt', 'natroom'
+	end
+	act 'Offer to repay Christina':
+		*clr & cla
+		NatbelQW['chrispaid'] = 2
+		gs 'npc_relationship', 'modify', 'A16', 'like'
+		gs 'stat'
+		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha3.jpg"></center>'
+		'You look at Natasha, who is now slumped on the floor with her head in her hands. You contemplate what she said and how much she''s clearly terrified of Christina. "Um... Okay."'
+		'A confused Natasha looks at you, "Uh? Sorry, what do you mean?"'
+		'"I mean, leave it to me. I''ll pay back your debt to Christina. Just try and keep out of her way until then."'
+		'Natasha simply nods, clearly not trusting herself to speak.'
+		'"Okay, Natasha, I''m going to leave now. See you soon and don''t worry, just steer clear of Christina for a while!"'
+		act 'Stop talking': gt 'natbelapt', 'natroom'
+	end
+end
+
+if $ARGS[0] = 'chris_chat_sub':
+	act 'As her sub you cannot stop Christina bullying Natasha':
+		NatbelQW['chrispaid'] = 6
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
+		'"I''m afraid I can''t stop Christina from bullying you, so all I can suggest is that you do your best to keep away from her."'
+		'When you mention her name, Natasha immediately looks fearful and she sits on the floor covering her face with her hands. She nods her head. "Okay, I''m doing everything I can to keep my distance from that bully!"'
+		'You nod, "Yeah, that''s a good plan. I''m going to do the same."'
+
+		act 'Continue':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
+			'Natasha turns to you with a weak smile and gives you a sweet kiss. "Well, I guess we''re both in the same boat here, <<$pcs_nickname>>. Let''s just support each other as best we can."'
+			'You share a comforting hug.'
+
+			act 'Return to her room': gt 'natbelapt', 'natroom'
+		end
+	end
+end
+
+if $ARGS[0] = 'chris_chat':
+	act 'Christina has been dealt with':
+		NatbelQW['chrispaid'] = 7
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha3.jpg"></center>'
+		'"Well, I have some good news for you," you say, beaming with pride.'
+		'Natasha smiles at you in acknowledgment and waits for you to continue.'
+		'"You remember that I said Christina needed to be dealt with?"'
+		'When you mention the girl''s name, Natasha immediately looks fearful and she sits on the floor covering her face with her hands. She simply nods her head to confirm that she remembers the conversation.'
+		'"Natasha, come on, there''s no need to get all upset, I said it was good news! Or did she do something else to you?"'
+		'"No, nothing happened! She just scares me," she says with a sigh.'
+		'You try to reassure her, "Right, well, I''ve sorted your problems with her and she shouldn''t bully you any more."'
+		'Natasha shakes her head in disbelief, "How on Earth... Why would she stop? I don''t understand!"'
+
+		if christinaQW['fight'] = 1:
+			act 'Talk about the fight':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
+				'"You may have heard that we had a little, shall we say, ''altercation'' which I resolved to my satisfaction," you reply with a knowing smirk.'
+				'"Oh?" She looks up at you, realizing what you meant and breaks into another smile. "Oh! Right, the fight! Yeah, I was there! I wanted to stop you because I didn''t want to see you getting hurt, but I couldn''t reach you in time."'
+				'You reply with a chuckle. "Well, you wouldn''t have stopped me! Anyway, I started the fight. I was walking by her and she ran her mouth, like always. Normally I might have tried to say something back, only this time I decided to hit her as hard as I could and it went from there. I think she was shocked that I stood up to her. She was certainly surprised that I had the strength and skill to beat her. But I was so sick of taking her shit!"'
+				'After, when I spoke to her about leaving you alone, I brought up that I wouldn''t have a problem beating her up again and I pointed out that it''d be worse for her if I had to do it a second time. She agreed with me, so everything''s good now."'
+				'Natasha turns to you and gives you a sweet kiss. "Thank you, <<$pcs_nickname>>."'
+				'Your smile widens. "I''m glad I could help. I couldn''t let her bully my girlfriend.'
+				'"You know, <<$pcs_nickname>>, I like hearing you call me that."'
+				'You giggle. "Okay, <i>girlfriend</i>."'
+				act 'Keep talking': gt 'natbel_chat', 'chat'
+				act 'Stop talking': gt 'natbelapt', 'natroom'
+			end
+
+		else
+			act 'Continue':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
+				'You give her a mischievous grin, "Well, I can''t tell you any of the details, but let''s just say she won''t be causing us any issues going forward."'
+				'Natasha turns to you and gives you a sweet kiss. "Okay, I guess I don''t need to know everything but thank you, <<$pcs_nickname>>."'
+				'Your smile widens. "I''m glad I could help. I won''t let her bully my girlfriend.'
+				'"You know, <<$pcs_nickname>>, I like hearing you call me that."'
+				'You giggle. "Okay, <i>girlfriend</i>."'
+				act 'Keep talking': gt 'natbel_chat', 'chat'
+				act 'Stop talking': gt 'natbelapt', 'natroom'
+			end
+		end
+	end
+end
+
+
+
+	!! ---- LOVER chats ---- !!
+
 if $ARGS[0] = 'lover_events_chat':
 	act 'Keep talking': gt 'natbel_chat', 'chat'
 	act 'Stop talking': gt 'natbelapt', 'natroom'
@@ -379,75 +466,131 @@ if $ARGS[0] = 'lover_events_chat':
 	end
 end
 
-if $ARGS[0] = 'chris_chat_sub':
-	act 'As her sub you cannot stop Christina bullying Natasha':
-		NatbelQW['chrispaid'] = 6
+if $ARGS[0] = 'first_kiss':
+	act 'Kiss her':
+		NatbelQW['FriendLover'] = 2
+		gs 'npc_relationship', 'modify', 'A16', 'like'
+		gs 'stat'
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
+		'Seeing her so vulnerable and knowing that she needs some love and affection, you kiss Natasha on impulse.'
+		'You feel her ease into you, hesitantly at first. But soon it develops into a full on kiss with her tongue dancing around yours exploring your mouth as you do hers. Both overcome with the emotion of the situation, your hands also start exploring each others bodies.'
+		'Not wanting to overwhelm the poor girl with even more emotions, you soon pull yourself back and each take a few moments to recover your poise.'
+
+		act 'Keep talking': gt 'natbel_chat', 'chat'
+		act 'Stop talking': gt 'natbelapt', 'natroom'
+	end
+end
+
+if $ARGS[0] = 'lover_chat':
+	act 'Kiss your girlfriend':
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
-		'"I''m afraid I can''t stop Christina from bullying you, so all I can suggest is that you do your best to keep away from her."'
-		'When you mention her name, Natasha immediately looks fearful and she sits on the floor covering her face with her hands. She nods her head. "Okay, I''m doing everything I can to keep my distance from that bully!"'
-		'You nod, "Yeah, that''s a good plan. I''m going to do the same."'
+		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha24a.mp4"></center>'
+		'You notice that Natasha is giving you a longing look. Your eyes wander down to her delicious looking lips and you start lusting after your girlfriend. You make your way towards her bed and she quickly joins you.'
+		'She slowly leans in towards you. Taking hold of her face, you press your lips against hers and begin a long, sensual kiss.'
+		'After what seems like ages, but was probably only a few seconds, you breathlessly pull apart.'
+		'Smiling, you greet her. "Hello, hot stuff!"'
+		'"Well, hello to my sizzling girlfriend, too!" she replies, grinning at you and licking her lips. "Fuck! That was hot!"'
+		'You both just sit there for a moment with a silly grin plastered on both your faces while you look at each other.'
 
-		act 'Continue':
-			*clr & cla
-			minut += 5
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
-			'Natasha turns to you with a weak smile and gives you a sweet kiss. "Well, I guess we''re both in the same boat here, <<$pcs_nickname>>. Let''s just support each other as best we can."'
-			'You share a comforting hug.'
+		act 'Keep talking': gt 'natbel_chat', 'chat'
+		act 'Stop talking': gt 'natbelapt', 'natroom'
+	end
 
-			act 'Return to her room': gt 'natbelapt', 'natroom'
-		end
+	if NatbelQW['FriendLover'] = 3:
+		if NatbelQW['chrispaid'] > 4: gs 'natbel_chat', 'arrange_shop_trip1'
+
+	elseif NatbelQW['FriendLover'] = 4:
+		if daystart => NatbelQW['evt_day'] + 14 and money > 2550 and hour < 18 and week < 7: act 'Start shopping trip': gt 'natbel_friend', 'shopping_trip'
+
+	elseif NatbelQW['FriendLover'] = 5:
+		gs 'natbel_chat', 'arrange_shop_trip2'
+	
+	elseif NatbelQW['FriendLover'] = 6:
+		if daystart => NatbelQW['evt_day'] + 14 and money > 4350 and hour < 18 and week < 7: act 'Start shopping trip': gt 'natbel_friend', 'shopping_trip2'
+	
+	elseif NatbelQW['FriendLover'] = 7:
+		if money >= 25 and (week = 5 or week = 6) and (hour = 20 or hour = 21): act 'Ask Natasha to the disco': gt 'natbel_friend', 'disco_2'
+
+	elseif NatbelQW['FriendLover'] >= 8:
+		act 'Natasha asks a question': gs 'natbel_chat', 'job_questions'
 	end
 end
 
-if $ARGS[0] = 'chris_chat':
-	act 'Christina has been dealt with':
-		NatbelQW['chrispaid'] = 7
+if $ARGS[0] = 'arrange_shop_trip1':
+	act 'Arrange a shopping trip for a new school uniform':
+		NatbelQW['FriendLover'] = 4
+		NatbelQW['evt_day'] = daystart
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha3.jpg"></center>'
-		'"Well, I have some good news for you," you say, beaming with pride.'
-		'Natasha smiles at you in acknowledgment and waits for you to continue.'
-		'"You remember that I said Christina needed to be dealt with?"'
-		'When you mention the girl''s name, Natasha immediately looks fearful and she sits on the floor covering her face with her hands. She simply nods her head to confirm that she remembers the conversation.'
-		'"Natasha, come on, there''s no need to get all upset, I said it was good news! Or did she do something else to you?"'
-		'"No, nothing happened! She just scares me," she says with a sigh.'
-		'You try to reassure her, "Right, well, I''ve sorted your problems with her and she shouldn''t bully you any more."'
-		'Natasha shakes her head in disbelief, "How on Earth... Why would she stop? I don''t understand!"'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha6.jpg"></center>'
+		'You pick up some of the fashion magazines from Natasha''s desk and motion for her to sit with you.'
+		'You smile at her, "Okay, Natasha, I think we need to get you a new school uniform. What do you say?"'
+		'"Oh, <<$pcs_nickname>>, that would be lovely. But..."'
+
+		act 'Smack her "butt"':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha21.jpg"></center>'
+			'You giggle when she mentions the word ''but''. "Natasha, please stand up."'
+			'She looks at you a little confused but complies.'
+			'"What were the rules for fun stuff?" you ask.'
+			'A smile crosses her face and she leans slightly forward.'
+			'You give her a gentle slap on the butt.'
+			'She wiggles her butt slightly. "Tash is shaking her tush! Tash is shaking her tush!" she says, giggling.'
+			'"Oh, so you like this, eh?" You smack her twice more, a bit less gentle but not so hard as to hurt.'
+			'Natasha initially lets out a small squeal.'
+			'"Alright, that''s enough for now or you might start to like it. Maybe I need to devise a different punishment?" After a small pause you continue, "Okay, get your sexy butt back here. Where on earth did you get that phrase from?"'
+			'"I can''t really remember. I think it was some American film I saw a while back."'
+			'You give a small giggle. "Well, it''s very appropriate. But just stop with the objections, please, or I might change my mind about this trip."'
 
-		if christinaQW['fight'] = 1:
-			act 'Talk about the fight':
+			act 'Continue':
 				*clr & cla
 				minut += 5
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
-				'"You may have heard that we had a little, shall we say, ''altercation'' which I resolved to my satisfaction," you reply with a knowing smirk.'
-				'"Oh?" She looks up at you, realizing what you meant and breaks into another smile. "Oh! Right, the fight! Yeah, I was there! I wanted to stop you because I didn''t want to see you getting hurt, but I couldn''t reach you in time."'
-				'You reply with a chuckle. "Well, you wouldn''t have stopped me! Anyway, I started the fight. I was walking by her and she ran her mouth, like always. Normally I might have tried to say something back, only this time I decided to hit her as hard as I could and it went from there. I think she was shocked that I stood up to her. She was certainly surprised that I had the strength and skill to beat her. But I was so sick of taking her shit!"'
-				'After, when I spoke to her about leaving you alone, I brought up that I wouldn''t have a problem beating her up again and I pointed out that it''d be worse for her if I had to do it a second time. She agreed with me, so everything''s good now."'
-				'Natasha turns to you and gives you a sweet kiss. "Thank you, <<$pcs_nickname>>."'
-				'Your smile widens. "I''m glad I could help. I couldn''t let her bully my girlfriend.'
-				'"You know, <<$pcs_nickname>>, I like hearing you call me that."'
-				'You giggle. "Okay, <i>girlfriend</i>."'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha7.jpg"></center>'
+				'Natasha sits beside you and you return to looking through the magazine. "Give me some time to get the money together and we''ll head over to GM and get you a new uniform."'
+				'"<<$pcs_nickname>>, that would be lovely and I''ll earn some money too so we can go and get something to eat after."'
+				'"That would be great, Natasha. Thank you."'
+
 				act 'Keep talking': gt 'natbel_chat', 'chat'
 				act 'Stop talking': gt 'natbelapt', 'natroom'
 			end
+		end
+	end
+end
+
+if $ARGS[0] = 'arrange_shop_trip2':
+	act 'Arrange a shopping trip for an outfit':
+		NatbelQW['FriendLover'] = 6
+		NatbelQW['evt_day'] = daystart
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha6.jpg"></center>'
+		'You pick up some of the fashion magazines from Natasha''s desk and motion for her to sit with you.'
+		'She joins you and you start browsing.'
+		'You smile at her, "Like I said earlier, I want to get you a general outfit for going out and about. I was thinking we could head off to Coco and Flamingos to see what they''ve got. Oh and before you reply, the only answer I''ll accept is ''Yes, <<$pcs_nickname>>''!'
+		'"Oh, yes, <<$pcs_nickname>>! That would be lovely! Thank you. I''ll look forward to it."'
+
+		act 'Continue':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha24.jpg"></center>'
+			'You giggle. "Good girl, I knew all those brains would get the hang of this in the end and you see you can agree without adding a ''but''!"'
+			'The girl joins in the giggling when you say that, remembering the last time and stands up and lifts her skirt.'
+			'She looks at you still smiling and says. "So no smacks then, <<$pcs_nickname>>?"'
+			'"Tempting! Yeah, that''s one cute, sexy butt, girlfriend. Anyway get your butt back here before we get distracted," you say.'
 
-		else
 			act 'Continue':
 				*clr & cla
-				minut += 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
-				'You give her a mischievous grin, "Well, I can''t tell you any of the details, but let''s just say she won''t be causing us any issues going forward."'
-				'Natasha turns to you and gives you a sweet kiss. "Okay, I guess I don''t need to know everything but thank you, <<$pcs_nickname>>."'
-				'Your smile widens. "I''m glad I could help. I won''t let her bully my girlfriend.'
-				'"You know, <<$pcs_nickname>>, I like hearing you call me that."'
-				'You giggle. "Okay, <i>girlfriend</i>."'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha7.jpg"></center>'
+				'Natasha sits back down beside you and you keep looking at the magazine. "Okay, well, give me a couple of weeks to get the money together and we''ll go out to shop for your outfit."'
+				'"<<$pcs_nickname>>, you know that you don''t have to keep spoiling me! I''m just happy you want to be my friend and now my girlfriend," she says with a broad grin."'
+				'"Yes, I know, Natasha. I''m just happy to help."'
 				act 'Keep talking': gt 'natbel_chat', 'chat'
 				act 'Stop talking': gt 'natbelapt', 'natroom'
 			end
@@ -455,6 +598,10 @@ if $ARGS[0] = 'chris_chat':
 	end
 end
 
+
+
+	!! ---- FRIEND chat ---- !!
+
 if $ARGS[0] = 'friend_chat':
 	act 'Hangout':
 
@@ -561,6 +708,11 @@ if $ARGS[0] = 'friend_chat':
 
 end
 
+
+
+
+	!! ---- CASUAL chat ---- !!
+
 if $ARGS[0] = 'small_talk':
 	minut += 15
 	gs 'stat'
@@ -618,125 +770,9 @@ if $ARGS[0] = 'snacks':
 	act 'Follow her':gt 'natbelEv', 'snack'
 end
 
-if $ARGS[0] = 'first_kiss':
-	act 'Kiss her':
-		NatbelQW['FriendLover'] = 2
-		gs 'npc_relationship', 'modify', 'A16', 'like'
-		gs 'stat'
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha5.jpg"></center>'
-		'Seeing her so vulnerable and knowing that she needs some love and affection, you kiss Natasha on impulse.'
-		'You feel her ease into you, hesitantly at first. But soon it develops into a full on kiss with her tongue dancing around yours exploring your mouth as you do hers. Both overcome with the emotion of the situation, your hands also start exploring each others bodies.'
-		'Not wanting to overwhelm the poor girl with even more emotions, you soon pull yourself back and each take a few moments to recover your poise.'
-
-		act 'Keep talking': gt 'natbel_chat', 'chat'
-		act 'Stop talking': gt 'natbelapt', 'natroom'
-	end
-end
-
-if $ARGS[0] = 'lover_chat':
-	act 'Kiss your girlfriend':
-		*clr & cla
-		minut += 5
-		gs 'stat'
-		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha24a.mp4"></center>'
-		'You notice that Natasha is giving you a longing look. Your eyes wander down to her delicious looking lips and you start lusting after your girlfriend. You make your way towards her bed and she quickly joins you.'
-		'She slowly leans in towards you. Taking hold of her face, you press your lips against hers and begin a long, sensual kiss.'
-		'After what seems like ages, but was probably only a few seconds, you breathlessly pull apart.'
-		'Smiling, you greet her. "Hello, hot stuff!"'
-		'"Well, hello to my sizzling girlfriend, too!" she replies, grinning at you and licking her lips. "Fuck! That was hot!"'
-		'You both just sit there for a moment with a silly grin plastered on both your faces while you look at each other.'
-
-		act 'Keep talking': gt 'natbel_chat', 'chat'
-		act 'Stop talking': gt 'natbelapt', 'natroom'	
-	end
-	if NatbelQW['chrispaid'] > 4 and NatbelQW['FriendLover'] = 3:
-		act 'Arrange a shopping trip for a new school uniform':
-			NatbelQW['FriendLover'] = 4
-			NatbelQW['evt_day'] = daystart
-			*clr & cla
-			minut += 5
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha6.jpg"></center>'
-			'You pick up some of the fashion magazines from Natasha''s desk and motion for her to sit with you.'
-			'You smile at her, "Okay, Natasha, I think we need to get you a new school uniform. What do you say?"'
-			'"Oh, <<$pcs_nickname>>, that would be lovely. But..."'
-
-			act 'Smack her "butt"':
-				*clr & cla
-				minut += 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha21.jpg"></center>'
-				'You giggle when she mentions the word ''but''. "Natasha, please stand up."'
-				'She looks at you a little confused but complies.'
-				'"What were the rules for fun stuff?" you ask.'
-				'A smile crosses her face and she leans slightly forward.'
-				'You give her a gentle slap on the butt.'
-				'She wiggles her butt slightly. "Tash is shaking her tush! Tash is shaking her tush!" she says, giggling.'
-				'"Oh, so you like this, eh?" You smack her twice more, a bit less gentle but not so hard as to hurt.'
-				'Natasha initially lets out a small squeal.'
-				'"Alright, that''s enough for now or you might start to like it. Maybe I need to devise a different punishment?" After a small pause you continue, "Okay, get your sexy butt back here. Where on earth did you get that phrase from?"'
-				'"I can''t really remember. I think it was some American film I saw a while back."'
-				'You give a small giggle. "Well, it''s very appropriate. But just stop with the objections, please, or I might change my mind about this trip."'
-
-				act 'Continue':
-					*clr & cla
-					minut += 5
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha7.jpg"></center>'
-					'Natasha sits beside you and you return to looking through the magazine. "Give me some time to get the money together and we''ll head over to GM and get you a new uniform."'
-					'"<<$pcs_nickname>>, that would be lovely and I''ll earn some money too so we can go and get something to eat after."'
-					'"That would be great, Natasha. Thank you."'
-
-					act 'Keep talking': gt 'natbel_chat', 'chat'
-					act 'Stop talking': gt 'natbelapt', 'natroom'
-				end
-			end
-		end
-	end
-	if NatbelQW['FriendLover'] = 5:
-		act 'Arrange a shopping trip for an outfit':
-			NatbelQW['FriendLover'] = 6
-			NatbelQW['evt_day'] = daystart
-			*clr & cla
-			minut += 5
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha6.jpg"></center>'
-			'You pick up some of the fashion magazines from Natasha''s desk and motion for her to sit with you.'
-			'She joins you and you start browsing.'
-			'You smile at her, "Like I said earlier, I want to get you a general outfit for going out and about. I was thinking we could head off to Coco and Flamingos to see what they''ve got. Oh and before you reply, the only answer I''ll accept is ''Yes, <<$pcs_nickname>>''!'
-			'"Oh, yes, <<$pcs_nickname>>! That would be lovely! Thank you. I''ll look forward to it."'
 
-			act 'Continue':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha24.jpg"></center>'
-				'You giggle. "Good girl, I knew all those brains would get the hang of this in the end and you see you can agree without adding a ''but''!"'
-				'The girl joins in the giggling when you say that, remembering the last time and stands up and lifts her skirt.'
-				'She looks at you still smiling and says. "So no smacks then, <<$pcs_nickname>>?"'
-				'"Tempting! Yeah, that''s one cute, sexy butt, girlfriend. Anyway get your butt back here before we get distracted," you say.'
 
-				act 'Continue':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha7.jpg"></center>'
-					'Natasha sits back down beside you and you keep looking at the magazine. "Okay, well, give me a couple of weeks to get the money together and we''ll go out to shop for your outfit."'
-					'"<<$pcs_nickname>>, you know that you don''t have to keep spoiling me! I''m just happy you want to be my friend and now my girlfriend," she says with a broad grin."'
-					'"Yes, I know, Natasha. I''m just happy to help."'
-					act 'Keep talking': gt 'natbel_chat', 'chat'
-					act 'Stop talking': gt 'natbelapt', 'natroom'
-				end
-			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
-	if NatbelQW['FriendLover'] >= 7 and money >= 25 and (week = 5 or week = 6) and (hour = 20 or hour = 21):
-		act 'Ask Natasha to the disco': gt 'natbel_friend', 'disco_2'
-	end
-end
+	!! ---- PREGNANCY chats ---- !!
 
 if $ARGS[0] = 'natknows':
 	cla
@@ -798,87 +834,88 @@ if $ARGS[0] = 'natknows1':
 	act 'Continue':gt 'natbelapt', 'natroom'
 end
 
-if $ARGS[0] = 'debt_forgive':
-	if NatbelQW['Debt'] > 0 and NatbelQW['DebtDay'] <= daystart:
-		if NatbelQW['QWstage'] = 2:
-			act 'Forgive Natasha''s debt':
-				NatbelQW['Debt'] = 0
-				NatbelQW['DebtDay'] = 0
-				NatbelQW['DebtForgiven'] = 1
-				gs 'npc_relationship', 'modify', 'A16', 'adore'
-				minut += 5
-				gs 'stat'
+if $ARGS[0] = 'preg_chat':
+	if npc_pregtalk['A16'] = 0 and kid = 0:
+		if NatbelQW['pregday'] > 0 and (daystart-NatbelQW['pregday']) > 90 and (daystart-NatbelQW['pregday']) < 200 and func('body_din','pregnancyVisibility') = 1:
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
+			'"<<$pcs_nickname>>, are you pregnant, too? Well, I guess I don''t have to worry about being the only pregnant girl at school," she giggles.'
+
+			act 'Continue':gt 'natbel_chat', 'natknows'
+		elseif NatbelQW['pregday'] > 0 and (daystart-NatbelQW['pregday']) > 90 and (daystart-NatbelQW['pregday']) < 200 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
+			act 'Tell her you''re pregnant':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha1.jpg"></center>'
-				'You look at her and it is clear that she is close to tears, probably having feared the worst. Feeling for her, you try to comfort her, "Come on, Natasha. Did you really think I expected you to be able to repay me? I... hear about the gossip at school. You''ve been a good friend to me and helped me with my homework when I was struggling, so let me help you too."'
-				'Overcome with relief, Natasha starts sobbing. "I''m just so grateful. I really didn''t expect you to do that. I really want to repay you, however I can."'
-				'You lift up her chin, kiss her on the cheek and give her a big hug. "Let''s see where our journey takes us," you say to her as her tears subside.'
-				act 'Keep talking': gt 'natbel_chat', 'chat'
-				act 'Stop talking': gt 'natbelapt', 'natroom'
-				act 'Ask her about what she bought <br><font color="red">This option will block the Natasha submissive path.</font>':
-					gt 'natbel_chat', 'debt_forgive2'
-				end
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
+				'"If you were worried about being the only pregnant girl at school, that won''t be a problem anymore." You smirk while rubbing your midriff. "It looks like I got myself knocked up as well."'
+				'Natasha smiles at you excitedly. "Really? Congratulations!"'
+
+				act 'Continue':gt 'natbel_chat', 'natknows'
 			end
-		else
-			act 'Forgive Natasha''s debt':
-				NatbelQW['Debt'] = 0
-				NatbelQW['DebtDay'] = 0
-				NatbelQW['DebtForgiven'] += 1
-				minut += 5
-				gs 'stat'
+		elseif NatbelQW['QWstage'] <= 5 and pregchem > 0 and knowpreg = 1:
+			act 'Tell her you''re pregnant':
+				npc_pregtalk['A16'] = 1
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha1.jpg"></center>'
-				'You decide to forgive Natasha''s debt. She is delighted and thanks you with all her heart.'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
+				'"<<$pcs_nickname>>, you''re," she pauses momentarily before continuing in a tone of shock mixed with disgust, "pregnant? Have you been sleeping around? This will definitely impact your studies."'
 
-				act 'Keep talking': gt 'natbel_chat', 'chat'
-				act 'Stop talking': gt 'natbelapt', 'natroom'
+				act 'Continue' :gt 'natbelapt', 'natroom'
+			end
+		elseif pregchem > 0 and knowpreg = 1:
+			act 'Tell her you''re pregnant':
+				npc_pregtalk['A16'] = 1
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
+				'"You''re pregnant? Who''s the father?"'
+				if $wombthfath = '' or $wombthfathID = 'unknown':
+					'"Honestly, I don''t even know."'
+					'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
+
+					act 'Continue' :gt 'natbelapt', 'natroom'
+				else
+					'You tell her that <<$wombthfath>> is the father and then give her brief details as to how you got pregnant, without getting too explicit.'
+					'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
+
+					act 'Continue' :gt 'natbelapt', 'natroom'
+				end
 			end
 		end
 	end
-end
 
-if $ARGS[0] = 'debt_forgive2':
-	*clr & cla
-	menu_off = 1
-	NatbelQW['FriendLover'] = 1
-	minut += 5
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha1.jpg"></center>'
-	'"So Natasha, do you want to show me what you bought with the money I lent you? I''ve been looking forward to seeing it."'
-	'Natasha looks worried again and with a very croaky voice replies, "I''m sorry <<$pcs_nickname>>, I didn''t manage to get anything!"'
-	'You are a bit confused. "Sorry, Natasha. I gave you five thousand rubles! I thought you could treat yourself to a new outfit or two?"'
-	'The girl can''t hold back her tears and starts sobbing again. A little exasperated, you give her another hug. "Look, Natasha. Please stop crying. I''m not mad at you, I just want to know what happened. You''re my friend and I want to help if I can."'
-	'Natasha responds, "You''ve already helped me more than I could imagine. I couldn''t hope for more."'
-	'"Look, enough with the tears and the apologies. Please, just tell me."'
-	'Natasha looks at you and is clearly worried. She takes a deep breath, "I had a few debts I had to repay as I was getting chased and then I had to help my mum so there''s nothing left..."'
-	'You nod your head, "Right, okay. So did you get all your debts repaid?"'
-	'She shakes her head. "No. I still owe Christina 500 rubles."'
-	'"And that''s the last debt you owe?" you ask her.'
-	'"Yeah, that''s the last one."'
-	act 'Let her deal with the last debt':
-		*clr & cla
-		NatbelQW['chrispaid'] = 1
-		NatbelQW['evt_day'] = daystart
-		
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha2.jpg"></center>'
-		'"Okay, well, that''s not too bad. I think you can handle that one by yourself," you say.'
-		'She nods her head slowly.'
-		act 'Keep talking': gt 'natbel_chat', 'chat'
-		act 'Stop talking': gt 'natbelapt', 'natroom'
-	end
-	act 'Offer to repay Christina':
-		*clr & cla
-		NatbelQW['chrispaid'] = 2
-		gs 'npc_relationship', 'modify', 'A16', 'like'
-		gs 'stat'
-		
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha3.jpg"></center>'
-		'You look at Natasha, who is now slumped on the floor with her head in her hands. You contemplate what she said and how much she''s clearly terrified of Christina. "Um... Okay."'
-		'A confused Natasha looks at you, "Uh? Sorry, what do you mean?"'
-		'"I mean, leave it to me. I''ll pay back your debt to Christina. Just try and keep out of her way until then."'
-		'Natasha simply nods, clearly not trusting herself to speak.'
-		'"Okay, Natasha, I''m going to leave now. See you soon and don''t worry, just steer clear of Christina for a while!"'
-		act 'Stop talking': gt 'natbelapt', 'natroom'
+	if npc_pregtalk['A16'] = 0 and kid > 0:
+		if (NatbelQW['pregday'] > 0 and (daystart-NatbelQW['pregday']) > 90 and (daystart-NatbelQW['pregday'])< 200) or (NatbelQW['babycount'] > 0) and func('body_din','pregnancyVisibility') = 1:
+			*clr & cla
+			
+			'"Wow, <<$pcs_nickname>>, you''re pregnant again? You''re really committed to making sure I''m not the only young mother around here, huh?" She playfully smiles and puts a hand on your shoulder. "It''s good to know you''re looking out for me."'
+
+			act 'Next':gt 'natbel_chat', 'natknows1'
+		elseif (NatbelQW['pregday'] > 0 and (daystart-NatbelQW['pregday']) > 90 and (daystart-NatbelQW['pregday'])< 200) or (NatbelQW['babycount'] > 0) and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
+			act 'Tell her you''re pregnant':
+				*clr & cla
+				
+				'"Hey, guess who''s pregnant again. You know, I''m glad I forced you to let Kolka impregnate you so that I could have someone I can relate to."'
+				'Natasha stares at you for a moment, stunned, trying to determine if the second half of your statement was a joke, before the first half clicks in her mind. "Oh my God, that''s wonderful!" she exclaims as she throws her arms around you and hugs you. When she finally lets go, she asks'
+
+				act 'Next':gt 'natbel_chat', 'natknows1'
+			end
+		elseif NatbelQW['QWstage'] <= 5 and pregchem > 0 and knowpreg = 1:
+			act 'Tell her you''re pregnant':
+				npc_pregtalk['A16'] = 1
+				*clr & cla
+				
+				'"Really? You''re pregnant again? You should really try to be more careful."'
+
+				act 'Continue' :gt 'natbelapt', 'natroom'
+			end
+		elseif pregchem > 0 and knowpreg = 1:
+			act 'Tell her you''re pregnant':
+				npc_pregtalk['A16'] = 1
+				*clr & cla
+				
+				'"You got pregnant again. It must be wonderful…" She trails off, clearly envious.'
+
+				act 'Continue' :gt 'natbelapt', 'natroom'
+			end
+		end
 	end
 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/npc_set_preference.qsrc

@@ -264,6 +264,7 @@ end
 !!				body_ass_flat
 !!				body_ass_average
 !!				body_ass_big
+!!				body_ass_heart
 !!				body_ass_bubble
 !!			bmi:
 !!				body_bmi_starving