Browse Source

Merge remote-tracking branch 'julzor/master'

KevinSmarts 5 years ago
parent
commit
500a1f97f2

+ 0 - 15
locations/Cheatmenu_din.qsrc

@@ -128,17 +128,6 @@ $cheatmenu['health'] = {
 	end
 }
 
-$cheatmenu['Bandit'] = {
-	if cheatBandit = 0:
-		cheatBandit = 1
-		dynamic $cheatmenu['permanent']
-		exit
-	elseif cheatBandit = 1:
-		cheatBandit = 0
-		dynamic $cheatmenu['permanent']
-	end
-}
-
 $cheatmenu['fight'] = {
 	if fight_cheat = 0:
 		fight_cheat = 1
@@ -429,8 +418,6 @@ $cheatmenu['permanent'] = {
 	if cheatHorny = 1:$cheatHorny = 'Currently ON'
 	if bedvibrator = 0:$cheatVib = 'Currently OFF'
 	if bedvibrator = 1:$cheatVib = 'Currently ON'
-	if cheatBandit = 0:$cheatBandit = 'Currently OFF'
-	if cheatBandit = 1:$cheatBandit = 'Currently ON'
 	if fight_cheat = 0:$fight_cheat = 'Currently OFF'
 	if fight_cheat = 1:$fight_cheat = 'Currently ON'
 	if autocombat_cheat = 0:$autocombat_cheat = 'Currently OFF'
@@ -474,7 +461,6 @@ $cheatmenu['permanent'] = {
 	*nl
 	
 	'Enable sleeping with vibrator inserted: <a href="exec:dynamic $cheatmenu[''Vibrator'']"><<$cheatVib>></a>'
-	'Bandit always horny: <a href="exec:dynamic $cheatmenu[''Bandit'']"><<$cheatBandit>></a>'
 	
 	*nl
 	
@@ -2376,7 +2362,6 @@ $cheatmenu['vartracker'] = {
 	'Mira''s Father Quest (npc_QW[''A64'']): <<npc_QW[''A64'']>>'
 	'Mira''s Quest (npc_QW[''A60'']): <<npc_QW[''A60'']>>'
 	'mirasextimes: <<mirasextimes>>'
-	'Bandit Quest Level (npc_QW[''A66'']): <<npc_QW[''A66'']>>'
 	'Mira''s Relationship (npc_rel[''A60'']): <<npc_rel[''A60'']>>'
 	'Mitka''s Quest (npc_QW[''A63'']): <<npc_QW[''A63'']>>'
 	'mirabrosextime: <<mirabrosextime>>'

+ 2 - 2
locations/Komp.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'brows':
 		'<center><b>Browser</b></center>'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/eror.jpg"></center>'
 		'You have no prepaid internet access remaining. You need to buy more, before you can go online again.'
-		if camwhore = 1:
+		if camwhore = 1 and $loc ! 'shulga_room':
 			'Since MyFreeCams will cover the cost, you can still log on to do a cam show.'
 			act 'Go to MyFreeCams.org':gt 'Komp', 'mfc'
 		end
@@ -71,7 +71,7 @@ if $ARGS[0] = 'brows':
 
 		if shantfoto > 0:act 'Find the girl you took photos of in the park on "Assbook"':gt 'Komp', 'foto'
 		if gor_dorm = 7:act 'Read letter from Eugene':gt 'etoexhib', 'pos91'
-		if camwhore = 1:act 'Go to MyFreeCams.org':gt 'Komp', 'mfc'
+		if camwhore = 1 and $loc ! 'shulga_room':act 'Go to MyFreeCams.org':gt 'Komp', 'mfc'
 		if (storyline = 1 and SchoolAtestat = 0) or student > 0:act 'Spend time studying':gt 'Komp', 'study'
 		if sucpcinfo = 0 and succubxp > 0: act 'Research the strange feelings you''ve been having': gt 'succubus', 'kompresearch'
 	end

+ 1 - 4
locations/din_van.qsrc

@@ -47,10 +47,7 @@ $bteeth = {
 }
 
 $dryOff = {
-	act 'Get out and dry off':
-		menu_off = 1
-		mirror_steam = hour & menu_off = 0 & gt $loc, $metka
-	end
+	act 'Get out and dry off': mirror_steam = hour & gt $loc, $metka
 }
 
 $shower = {

+ 50 - 13
locations/events.qsrc

@@ -272,21 +272,58 @@ if $ARGS[0] = 'snarkozaka':
 	'You walk to the end of the platform and see a man hiding undercover smoking a cigarette'
 	'Walking up to him you ask him if he has anything'
 	'He turns and looks you up and down, "That depends on what you want little lady?"'
-	act 'Heroin':
-		money -= 1500
-		StrongNarkota += 25
-		SNarkTimes += 1
-		narkozakday=day
-		gs'stat'
-		'You buy the drugs and without thinking twice you shoot up.'
-		gt 'events', 'snkayf'
+	act 'Leave': gt $loc, $metka
+	
+	if money >= 1500:
+		act 'Buy heroin (1500 <b>₽</b>)':
+			money -= 1500
+			StrongNarkota += 25
+			SNarkTimes += 1
+			narkozakday = day
+			gs'stat'
+			'You buy the drugs and without thinking twice you shoot up.'
+			gt 'events', 'snkayf'
+		end
+	else
+		'You don''t have enough money to buy heroin.'
 	end
-	act 'Amphetamines':
-		money -= 1000
-		amphetamine += 5
-		gt $loc, $metka
+	
+	if money >= 1000:
+		act 'Buy Amphetamine (5 for 1000 <b>₽</b>)':
+			money -= 1000
+			amphetamine += 5
+			gt $loc, $metka
+		end
+	else
+		'You don''t have enough money to buy amphetamine.'
+	end
+	
+	if money >= 50 and money < 500:
+		act 'Buy 1 joint (50 <b>₽</b>)':
+			money -= 50
+			drugUser = 1
+			joint += 1
+			minut += 5
+			gt $loc, $metka
+		end
+	elseif money >= 500:
+		act 'Buy 10 joints (500 <b>₽</b>)':
+			money -= 500
+			drugUser = 1
+			joint += 10
+			minut += 5
+			gt $loc, $metka
+		end
+		act 'Buy 1 (50 <b>₽</b>)':
+			money -= 50
+			drugUser = 1
+			joint += 1
+			minut += 5
+			gt $loc, $metka
+		end
+	else
+		'You don''t have enough money to buy a joint.'
 	end
-	act 'Leave': gt $loc, $metka
 end
 
 if $ARGS[0] = 'snkayf1':

+ 20 - 20
locations/foto.qsrc

@@ -1993,8 +1993,8 @@ if $ARGS[0] = 'model':
 					modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
 					modelfoto_fashion += 1
 					mdlng_exp += rand(5,8)
-					gs 'fame', 'city', 'mdlng', rand(7,12)
-					gs 'fame', 'pav', 'mdlng', rand(1,city_modelling)/10
+					gs 'fame', 'city', 'modelling', rand(7,12)
+					gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 					fashionshoot = rand(1,2)
 					gs 'stat'
 					if fashionshoot = 1:
@@ -2021,8 +2021,8 @@ if $ARGS[0] = 'model':
 						minut += 120
 						modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
 						modelfoto_bikini += 1
-						gs 'fame', 'city', 'mdlng', rand(7,12)
-						gs 'fame', 'pav', 'mdlng', rand(1,city_modelling)/10
+						gs 'fame', 'city', 'modelling', rand(7,12)
+						gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 						mdlng_exp += rand(6,10)
 						if pcs_inhib < 50:inhib_exp += 1
 						bikinishoot = rand(1,5)
@@ -2059,8 +2059,8 @@ if $ARGS[0] = 'model':
 						modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
 						modelfoto_lingerie += 1
 						mdlng_exp += rand(6,10)
-						gs 'fame', 'city', 'mdlng', rand(7,13)
-						gs 'fame', 'pav', 'mdlng', rand(0,city_modelling)/10
+						gs 'fame', 'city', 'modelling', rand(7,13)
+						gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
 						inhib_exp += 2
 						shoot_type = rand(1,2)
 						gs 'stat'
@@ -2147,8 +2147,8 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_glamour += 1
 				modelfoto_ero_clo += 1
 				mdlng_exp += rand(5,10)
-				gs 'fame', 'city', 'mdlng', rand(7,12)
-				gs 'fame', 'pav', 'mdlng', rand(1,city_modelling)/10
+				gs 'fame', 'city', 'modelling', rand(7,12)
+				gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 				inhib_exp += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ero<<rand(2,4)>>.jpg"></center>'
@@ -2172,8 +2172,8 @@ if $ARGS[0] = 'nude_shoot':
 			modelfoto_glamour += 1
 			modelfoto_nip += 1
 			mdlng_exp += rand(6,10)
-			gs 'fame', 'city', 'mdlng', rand(7,13)
-			gs 'fame', 'pav', 'mdlng', rand(1,city_modelling)/10
+			gs 'fame', 'city', 'modelling', rand(7,13)
+			gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 			inhib_exp += rand(1,3)
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru<<rand(1,6)>>.jpg"></center>'
@@ -2203,8 +2203,8 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_nip += 1
 				modelfoto_lingerie += 1
 				mdlng_exp += rand(8,10)
-				gs 'fame', 'city', 'mdlng', rand(9,14)
-				gs 'fame', 'pav', 'mdlng', rand(0,city_modelling)/10
+				gs 'fame', 'city', 'modelling', rand(9,14)
+				gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
 				inhib_exp += 4
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie_trans<<rand(1,3)>>.mp4"></video></center>'
@@ -2237,8 +2237,8 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_nip += 1
 				modelfoto_topless += 1
 				mdlng_exp += rand(6,10)
-				gs 'fame', 'city', 'mdlng', rand(8,14)
-				gs 'fame', 'pav', 'mdlng', rand(1,city_modelling)/10
+				gs 'fame', 'city', 'modelling', rand(8,14)
+				gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 				inhib_exp += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless<<rand(1,22)>>.jpg"></center>'
@@ -2269,8 +2269,8 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_glamour += 1
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
-				gs 'fame', 'city', 'mdlng', rand(10,20)
-				gs 'fame', 'pav', 'mdlng', rand(0,city_modelling)/4
+				gs 'fame', 'city', 'modelling', rand(10,20)
+				gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 				inhib_exp += 5
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(1,5)>>.jpg"></center>'
 				'	Already naked, you step onto the set and begin the shoot immediately.'
@@ -2300,8 +2300,8 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_glamour += 1
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
-				gs 'fame', 'city', 'mdlng', rand(10,20)
-				gs 'fame', 'pav', 'mdlng', rand(0,city_modelling)/4
+				gs 'fame', 'city', 'modelling', rand(10,20)
+				gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 				inhib_exp += 5
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(6,26)>>.jpg"></center>'
 				'	Already naked, you step onto the set and begin the shoot immediately.'
@@ -2335,8 +2335,8 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_nip += 1
 				modelfoto_pussy += 1
 				mdlng_exp += rand(9,10)
-				gs 'fame', 'city', 'mdlng', rand(10,20)
-				gs 'fame', 'pav', 'mdlng', rand(10,15)
+				gs 'fame', 'city', 'modelling', rand(10,20)
+				gs 'fame', 'pav', 'modelling', rand(10,15)
 				inhib_exp += 5
 				if pcs_pubes <= 20:
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(27,35)>>.jpg"></center>'

+ 1 - 1
locations/gdkin.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = '':
 
 	if music_on = 1:
 		$track_loop = 'sound/komb.mp3'
-		volume = 100
+		volume = 80
 		music_loop = 1
 		pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
 	else

+ 19 - 17
locations/gskino.qsrc

@@ -8,22 +8,11 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/theater/kinoteatr.jpg"></center>'
 'Small cinema in which there is just one small screen. A movie ticket costs 100 <b>₽</b>.'
 
-$kinoevent = {
-	act 'Turn around and look':
-		cls
-		pcs_horny += 3
-		gs'stat'
-		'<center><img src="images/locations/pavlovsk/park/theater/sex/kino.mp4"></center>'
-		'You see on the back row a girl sucking a guy, nobody reacts to the loud smacking sound that can be heard by the whole cinema.'
-		'You turn back and watch the rest of the film.'
-		act 'Leave the cinema':gt 'gskver', 'start'		
-	end
-}
+act 'Leave the cinema':minut += 5 & gt 'gskver', 'start'
 
 if money >= 100:
 	act 'Go to the movies':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		money -= 100
 		minut += 120
@@ -32,26 +21,39 @@ if money >= 100:
 			cla
 			'As you are watching the film a guy sits next to you and whispers in your ear, "Everyone knows you like to suck cock, I''ll pay you if you have a go on this."'
 			'Its dark, but you can just about see well enough to see that he is pointing at his dick.'
-			act 'Agree':gt 'gevent', '2'
 			act 'Reject':
 				cla
 				'You tell him you''d rather watch the film, he mutters something that sounded like bitch and leaves you to watch the rest of the movie in peace.'
 				act 'Leave the cinema':gt 'gskver', 'start'
 			end
+			act 'Agree':gt 'gevent', '2'
 			
 			exit
 		end
+		
+		act 'Leave the cinema':gt 'gskver', 'start'
+		
 		if rand(1,100) > 10:
 			'You quietly watch the film.'
 		else
-			'You quietly watch the movie, but suddenly behind you there is a strange sound.' & dynamic $kinoevent
+			'You quietly watch the movie, but suddenly behind you there is a strange sound.'
+			gs 'gskino', 'kinoevent'
 		end
+	end
+end
 
-		act 'Leave the cinema':gt 'gskver', 'start'
+if $ARGS[0] = 'kinoevent':
+	act 'Turn around and look':
+		*clr & cla
+		pcs_horny += 3
+		gs'stat'
+		'<center><video autoplay loop src="images/locations/pavlovsk/park/theater/sex/kino.mp4"></video></center>'
+		'You see on the back row a girl sucking a guy, nobody reacts to the loud smacking sound that can be heard by the whole cinema.'
+		'You turn back and watch the rest of the film.'
+		act 'Leave the cinema':gt 'gskver', 'start'		
 	end
 end
 
-act 'Leave the cinema':minut += 5 & gt 'gskver', 'start'
 
 --- gskino ---------------------------------
 

+ 9 - 1
locations/metro.qsrc

@@ -176,6 +176,7 @@ if $ARGS[0] = 'shop':
 	menu_off = 1
 	'<b>What''s it gonna be?</b>'
 	'He shows you a small box filled with red and blue pills. There is 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>'
 	else
@@ -205,7 +206,14 @@ if $ARGS[0] = 'shop':
 		end
 		'Uses left: <<aphrodisiac_have>>'
 	end
-	act 'back':gt 'metro','start'
+	if money >= 50:
+		'<a href="exec:money -= 50 & joint += 1 & gt ''metro'', ''shop''">Buy a joint</a> for 50 <b>₽</b>'
+	elseif money >= 500:
+		'<a href="exec:money -= 50 & joint += 1 & gt ''metro'', ''shop''">Buy a joint</a> for 50 <b>₽</b>'
+		'<a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">Buy ten joints</a> for 500 <b>₽</b>'
+	else
+		'Buy a joint 50 <b>₽</b> (You do not have enough money)'
+	end
 end
 
 if $ARGS[0] = 'dealer':

+ 2 - 4
locations/narkopriton.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 		act 'Leave the drug den': minut += 5 & gt 'street'
 		act 'Ask for heroin': gt 'narkopriton', 'heroin'
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
-		!!act 'Ask for joints': gt 'narkopriton', 'joint'
+		act 'Ask for weed': gt 'narkopriton', 'joint'
 	 if StoryLine = 1 and snarkozak = 0:
 			act 'Ask for a drop-off point in Pavlovsk':
 				minut +=5
@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 		act 'Leave the drug den': minut += 5 & gt 'street'
 		act 'Ask for heroin': gt 'narkopriton', 'heroin'
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
-		!!act 'Ask for joints': gt 'narkopriton', 'joint'
+		act 'Ask for weed': gt 'narkopriton', 'joint'
 	elseif (StrongNarkota > 23 and ampHigh > 23) or ampHigh > 23 or StrongNarkota > 23:
 		gt 'narkopriton', 'kiteHigh'
 	end
@@ -110,7 +110,6 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 20
 			minut += 5
-			gs 'stat'
 			gt 'narkopriton', 'joint'
 		end
 	end
@@ -120,7 +119,6 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 10
 			minut += 5
-			gs 'stat'
 			gt 'narkopriton', 'joint'
 		end
 	end

+ 354 - 205
locations/pavaptcourtev.qsrc

@@ -10,11 +10,19 @@ if $ARGS[0] = 'bench':
 	$loc = 'pavaptcourtev'
 	$location_type = 'public_outdoors'
 	gs 'stat'
-	if month >=11 and month <= 12 or month >=1 and month <=3:
-		!!Winter
+	if music_on = 1:
+		$track_loop = 'sound/outsideschool.mp3'
+		volume = 80
+		music_loop = 1
+		pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
+	else
+		music_loop = 0
+		close all
+		pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
+	end
+	if month >= 11 and month <= 12 or month >= 1 and month <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/benchw.jpg"></center>'
 	else
-		!!Summer
 		if hour >= 8 and hour <= 23:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/bench.jpg"></center>'
 		else
@@ -27,6 +35,7 @@ if $ARGS[0] = 'bench':
 	if cookmag = 1 or fashmag = 1 or compmag = 1 or biomag = 1 or knitmag = 1 or fitmag = 1: act 'Read a magazine': gt 'pavaptcourtev', 'read'
 	act 'Play on your phone': gt 'pavaptcourtev', 'phone'
 	if siga > 0: act 'Smoke': gt 'pavaptcourtev', 'smoke'
+	if joint > 0: act 'Smoke a joint': gt 'pavaptcourtev', 'smoke_joint'
 end
 
 if $ARGS[0] = 'wait':
@@ -90,6 +99,18 @@ if $ARGS[0] = 'smoke':
 	if siga > 0: act 'Have another cigarette': gt 'pavaptcourtev', 'smoke'
 end
 
+if $ARGS[0] = 'smoke_joint':
+	*clr & cla
+	menu_off = 1
+	pcs_mood += 10
+	minut += 10
+	gs 'shortgs','smoke_joint'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/benchsmoke.jpg"></center>'
+	'You pull a joint of your purse and light it up. Trying to act like you are just smoking a cigarette. You take a long slow drag off it as you relax on the bench, before long you are feeling the effects.'
+	act 'Get up': gt 'pavComplex', 'start'
+end
+
 if $ARGS[0] = 'events1':
 	CLOSE ALL
 	*clr & cla
@@ -100,12 +121,14 @@ if $ARGS[0] = 'events1':
 	minut += 5
 	gs 'stat'
 	
-	!!rolanmeet > 0: Rolan story has started
-	if rolanmeet = 0: events = rand(0,17)
-	if rolanmeet > 0: events = rand(0,22)
-	
 	:reroll_jump1
 	
+	if rolanmeet = 0: 
+		events = rand(0,17)
+	else
+		events = rand(0,22)
+	end
+		
 	if anushkaFirstvisit = 0 and npc_rel['A144'] > 50 and rand(0,1) = 1 and anushka_met ! daystart:
 		if storyline ! 1: jump 'reroll_jump1'
 		*clr & cla
@@ -201,6 +224,8 @@ if $ARGS[0] = 'events1':
 		end
 		'You notice some young boys heading over, the oldest about your brothers age. They are all holding water balloons or large open bottles of water. As they get closer they suddenly run over and start throwing the water on you, they chase you across the courtyard pretty much getting you soaking wet until they break off, when they see a new victim to go drench in water.'
 !!ToDo: I don''t know if there is code for making Sveta wet and her clothes wet or not, if so please add it, if not maybe we should think about adding it. Since this would mess up the hair, could make wet clothes uncomfortable to wear and in winter greatly increase the odds of getting sick if Sveta doesn''t go change into dry clothes.
+		pcs_hairbsh = 0
+		gs 'stat'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 13:
 		*clr & cla
@@ -212,7 +237,7 @@ if $ARGS[0] = 'events1':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evbj' + rand(1,2) + '.jpg"></center>'
 		text_rand = rand(0,2)
 		if text_rand = 0 or storyline ! 1:
-			'You spot an extremely happy looking man leaned up against the wall near the storage buildings, and squatting in front of him is a girl giving him an enthusiastic blowjob. You''re not exactly sure which of the two is enjoying it more. You don''t know either of these people, but you''ve seen them around here before. After a few minutes, you hear the guy moan, his cock never leaving the girl''s mouth. She continues to milk him for another minute before standing up and the two walk off together.'
+			'You spot an extremely happy looking guy leaning up against the wall near the storage buildings, and squatting in front of him is a girl giving him an enthusiastic blowjob. You''re not exactly sure which of the two is enjoying it more. You don''t know either of these people, but you''ve seen them around here before. After a few minutes, you hear the guy moan, his cock never leaving the girl''s mouth. She continues to milk him for another minute before standing up and the two walk off together.'
 		elseif text_rand = 1:
 			'You see, between two of the storage buildings, Lena squatting down before Lavrenti as she sucks his dick. Lena seems to be enjoying this almost as much as Lavrenti is enjoying getting the blowjob. After a few minutes, you hear him moan, his cock never leaving her mouth. She continues to milk him for another minute before standing up and the two walk off together. You wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him, knowing his reputation, when it comes to his sister.'
 		elseif text_rand = 2:
@@ -243,10 +268,29 @@ if $ARGS[0] = 'events1':
 		gs 'stat'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 16:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/nushbench.jpg"></center>'
+		'As you walk through the courtyard you see Anushka sitting on one of the benches, she hasn''t noticed you yet.'
+		act 'Move away':gt 'pavComplex', 'start'
+		act 'Take a seat next to her':
+			*clr & cla
+			pcs_mood += 10
+			npc_rel['A144'] += 1
+			gs 'Stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/nushbenchtalk.jpg"></center>'
+			'You stop and take a seat next to her, she glances over as you sit down. "Hey <<$pcs_nickname>> whats up?"'
+			'"Just killing time, kinda bored you know?" You tell her.'
+			'She nods a bit. "Yeah I know how that is, I was so bored I was making up little stories for what the people are doing." She pauses only a moment then indicates some old guy walking towards the garages. "Take him for example, he use to be part of the kgb. Now he is a freelance assasin and was just hired to go kill, that shrill of a old woman that is always sitting in the market yelling at every girl wearing a skirt higher than her ankle, you know the one."'
+			*nl
+			'You smile and nod that you know the one she means. "So did you hire him?"'
+			'That gets a laugh from her. "Ok your turn." You take a moment to spot someone else and start making up your own story. The two of you spend the next bit laughing and making up stories about the different people you see passing through the courtyard. Then she gets a message and jumps up with a huge grin. "Need to go, see you later." And with that she runs off.'
+			act 'Move away':gt 'pavComplex', 'start'
+		end
+	elseif events = 17:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boysmoke.jpg"></center>'
 		'You notice a couple of boys from the complex standing over near of the buildings by the garages smoking.'
-		act 'Move away':gt 'pavComplex', 'start'
+		act 'Move away': gt 'pavComplex', 'start'
 		act 'Ask for a cigarette':
 			*clr & cla
 			minut += 1
@@ -263,7 +307,13 @@ if $ARGS[0] = 'events1':
 				'Then he looks at you. "Sure you can have a cigarette if you suck our dicks first."'
 				'"What? Why the fuck would I do that?" you ask him.'
 				'He snorts a laugh. "Come on, everyone knows your a cocksucker. So get down on your knees and suck us off or get lost."'
-				act 'Move away':gt 'pavComplex', 'start'
+				gs 'willpower', 'bj'
+				if will_cost <= pcs_willpwr:
+					act 'Move away (<<will_cost>> Willpower)':
+						gs 'willpower', 'resist'
+						gt 'pavComplex', 'start' 
+					end
+				end
 				act 'Get down on your knees':gt 'pavaptcourtev', 'smokeblowjob'
 			else
 				'One of the boys nods and pulls a pack out of his pocket, he pulls a cigarette out and hands it to you.'
@@ -281,7 +331,7 @@ if $ARGS[0] = 'events1':
 				end
 			end
 		end
-	elseif events >= 17:
+	elseif events >= 18:
 		if storyline ! 1: jump 'reroll_jump1'
 		gt 'pavcomplexrolan'
 	end	
@@ -295,8 +345,6 @@ if $ARGS[0] = 'events2':
 	$loc = 'pavaptcourtev'
 	$location_type = 'public_outdoors'
 	gs 'stat'
-!!ToDo: Remove this and the next line if places are added to the game where sveta can smoke the joints (julzor)
-	:night_events_jump
 	:reroll_jump2
 	nightevents = rand(1,12)	
 	if nightevents = 1:
@@ -366,10 +414,10 @@ if $ARGS[0] = 'events2':
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif nightevents = 8:
 		*clr & cla
-!!ToDo: Remove this and the next line if places are added to the game where sveta can smoke the joints (julzor)
-		jump 'night_events_jump'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/weed.jpg"></center>'
 		'You turn at the sound of movement, just in time to see a guy slightly older than you walk up to you. He stops just short of you and is holding a joint in his hand. "You look like the type of girl that likes to have fun. Only fifty each or a dozen for five hundred. So what do you say?"'
+!!will add this later when I find a good image set for it (nutluck)
+!!act 'How about we party together?':	
 		act 'No thanks':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
@@ -389,9 +437,9 @@ if $ARGS[0] = 'events2':
 			end
 		end
 		if money >= 500: 
-			act 'Sure I''ll take ten':
+			act 'Sure I''ll take a dozen':
 				*clr & cla
-				joint += 1
+				joint += 12
 				minut += 1
 				money -= 500
 				gs 'stat'
@@ -399,9 +447,7 @@ if $ARGS[0] = 'events2':
 				'You glance around to make sure no one is watching, then you pull out five hundred from your purse and hand it over to him. He hands you a small bag of weed with some wrapping paper, with a smile and walks off. "Enjoy."'
 				act 'Move away':gt 'pavComplex', 'start'
 			end
-		end
-!!will add this later when I find a good image set for it.
-!!act 'How about we party together?':				
+		end			
 	elseif nightevents = 9:
 		if storyline ! 1: jump 'reroll_jump2'
 		*clr & cla
@@ -421,7 +467,7 @@ if $ARGS[0] = 'events2':
 			end
 			'You walk over to them. "Hey guys."'
 			if grupTipe = 5:
-				'They give you a look of disgust. "Get lost!"'
+				'They give you a look of disgust. "Get lost loser!"'
 				act 'Move away':gt 'pavComplex', 'start'
 			elseif grupTipe = 4:
 				'Vasily smiles to you and scoots over giving you a spot to sit between him and Dan. As you sit down he offers you a beer.'
@@ -464,7 +510,7 @@ if $ARGS[0] = 'events2':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/gopgirls.jpg"></center>'
 			'You walk over to them. "Hey guys, mind if I join you?"'
 			if grupTipe = 5:
-				'Lena and Lera give you a look of disgust. "Get lost!", while Alyona just ignores you.'
+				'Lena and Lera give you a look of disgust. "Get lost loser!", while Alyona just ignores you.'
 				act 'Move away':gt 'pavComplex', 'start'
 			elseif grupTipe = 4:
 				'They make some room on the bench. "Sure join us <<$pcs_nickname>>" Anushka says.'
@@ -500,7 +546,7 @@ if $ARGS[0] = 'events2':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/lelepa.jpg"></center>'
 			'You walk over to them. "Hey guys, mind if I join you?"'
 			if grupTipe = 5:
-				'They all give you a look of disgust. "Get lost!", is what Paulina says and the way she says it makes you think she is about ready to kick your ass for even asking.'
+				'They all give you a look of disgust. "Get lost loser!", is what Paulina says and the way she says it makes you think she is about ready to kick your ass for even asking.'
 				act 'Move away':gt 'pavComplex', 'start'
 			elseif grupTipe = 4:
 				'They make some room on the bench. "Sure join us <<$pcs_nickname>>" Paulina says.'
@@ -542,8 +588,14 @@ if $ARGS[0] = 'events2':
 				'Then he looks at you. "Sure you can have a cigarette if you suck our dicks first."'
 				'"What? Why the fuck would I do that?" you ask him'
 				'He snorts a laugh. "Come on, everyone knows your a cocksucker. So get down on your knees and suck us off or get lost."'
+				gs 'willpower', 'bj'
+				if will_cost <= pcs_willpwr:
+					act 'Move away (<<will_cost>> Willpower)':
+						gs 'willpower', 'resist'
+						gt 'pavComplex', 'start'
+					end
+				end
 				act 'Get down on your knees':gt 'pavaptcourtev', 'smokeblowjob'
-				act 'Move away':gt 'pavComplex', 'start'
 			else
 				cla
 				'One of the boys nods and pulls a pack out of his pocket, he pulls a cigarette out and hands it to you.'
@@ -574,81 +626,111 @@ if $ARGS[0] = 'male_gopnik_beer':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/drinkbeer.jpg"></center>'
 	'You take the offered beer, taking a swig of it. You listen to the boys talking about their latest ventures, which range from vandalizing, beating some guy up, to gang banging some slut. Occasionally you comment and as well, but you mostly just listen to them.'
-	act 'Stop drinking and leave':gt 'pavComplex', 'start'
-		act 'Drink more':
+	gs 'willpower', 'drink'
+	if will_cost <= pcs_willpwr:
+		act 'Stop drinking and leave(<<will_cost>> Willpower)':
+			gs 'willpower', 'resist'
+			gt 'pavComplex', 'start'
+		end
+	end
+	act 'Drink more':
+		*clr & cla
+		minut += 5
+		alko += 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
+		'You grab another beer from the collection the boys have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
+		gs 'willpower', 'drink'
+		if will_cost <= pcs_willpwr:
+			act 'Stop drinking and leave(<<will_cost>> Willpower)': 
+				gs 'willpower', 'resist'
+				gt 'pavComplex', 'start'
+			end
+		end
+		act 'Drink even more':
 			*clr & cla
 			minut += 5
 			alko += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
-			'You grab another beer from the collection the boys have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-			act 'Stop drinking and leave':gt 'pavComplex', 'start'
-			act 'Drink even more':
-				*clr & cla
-				minut += 5
-				alko += 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
-				if pav_slut < 50 and grupTipe ! 4:
-					'After you drink that beer, you are starting to feel the effects of the beers, but Vasily keeps you from grabbing another beer. "It''s time for you to go <<$pcs_nickname>>, good girls don''t get wasted like this." He won''t take no for an answer and escorts you away from them, before turning and going back to join Vitek and Dan himself.'
-					act 'Stop drinking and leave':gt 'pavComplex', 'start'
-				elseif kotovLoveQW > 0:
-					'After you drink that beer, you are starting to feel the effects of the beers, but Vitek gets up and pulls you up as well. "It''s time for you to go <<$pcs_nickname>>, you are getting to drunk. So go home and I will see you later." He won''t take no for an answer and escorts you away from them, before turning and going back to join Vasily and Dan himself.'
-					act 'Stop drinking and leave':gt 'pavComplex', 'start'
-				else
-					'You are starting to feel the effects of the beers but you are having to much fun. So you grab another beer from the collection the boys have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-					act 'Stop drinking and leave':gt 'pavComplex', 'start'
-					act 'Grab another beer':
-						*clr & cla
-						minut += 5
-						alko += 1
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
-						'Now you are feeling pretty drunk, the guys seem to be amused by just how drunk you are. They exchange a few words that you can''t quite make out. Then Vasily speaks up. "Hey <<$pcs_nickname>> you really know how to drink." You nod at the compliment because it is coming from these three. "Yeah I do okay."'
-						*nl
-						'This seems to amuse them even more. "Yeah I bet you could down a beer faster than Vitek can, couldn''t you?" You give him a look wondering what he is up to but right now you feel like you could out drink anyone so you nod. "Yeah I think I could."'
-						'Vasily grins widely. "Great then how about we make a bet, if you can drink one down faster than Vitek we will buy you a case of beer, but if you lose. You got to walk around the complex completely naked. What do you say?"'
-						act 'Refuse bet':
+			if pav_slut < 50 and grupTipe ! 4:
+				'After you drink that beer, you are starting to feel the effects of the beers, but Vasily keeps you from grabbing another beer. "It''s time for you to go <<$pcs_nickname>>, good girls don''t get wasted like this." He won''t take no for an answer and escorts you away from them, before turning and going back to join Vitek and Dan himself.'
+				act 'Stop drinking and leave':gt 'pavComplex', 'start'
+			elseif kotovLoveQW > 0:
+				'After you drink that beer, you are starting to feel the effects of the beers, but Vitek gets up and pulls you up as well. "It''s time for you to go <<$pcs_nickname>>, you are getting to drunk. So go home and I will see you later." He won''t take no for an answer and escorts you away from them, before turning and going back to join Vasily and Dan himself.'
+				act 'Stop drinking and leave':gt 'pavComplex', 'start'
+			else
+				'You are starting to feel the effects of the beers but you are having to much fun. So you grab another beer from the collection the boys have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
+				gs 'willpower', 'drink'
+				if will_cost <= pcs_willpwr:
+					act 'Stop drinking and leave(<<will_cost>> Willpower)': 
+						gs 'willpower', 'resist'
+						gt 'pavComplex', 'start'
+					end
+				end
+				act 'Grab another beer':
+					*clr & cla
+					minut += 5
+					alko += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
+					'Now you are feeling pretty drunk, the guys seem to be amused by just how drunk you are. They exchange a few words that you can''t quite make out. Then Vasily speaks up. "Hey <<$pcs_nickname>> you really know how to drink." You nod at the compliment because it is coming from these three. "Yeah I do okay."'
+					*nl
+					'This seems to amuse them even more. "Yeah I bet you could down a beer faster than Vitek can, couldn''t you?" You give him a look wondering what he is up to but right now you feel like you could out drink anyone so you nod. "Yeah I think I could."'
+					'Vasily grins widely. "Great then how about we make a bet, if you can drink one down faster than Vitek we will buy you a case of beer, but if you lose. You got to walk around the complex completely naked. What do you say?"'
+					gs 'willpower', 'exhib'
+					if will_cost <= pcs_willpwr:
+						act 'Refuse bet(<<will_cost>> Willpower)':
 							*clr & cla
+							gs 'willpower', 'resist'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/dandick.jpg"></center>'
 							'You shake your head no. "No I don''t think so, I wouldn''t win so no reason for me to make that bet." You reach for another beer but Dan pulls it away before you can grab it. Then he stands up and pulls his dick out of his pants. "If you want another beer you have to suck my dick."'
-							act 'Refuse':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
-								'You shake your head no. "I''m not sucking your dick for a beer Dan."'
-								'He laughs, "Then you''re not getting another beer." Knowing you won''t win this and you are not about to suck his dick for a beer you sigh and leave them.'
-								act 'Move away':gt 'pavComplex', 'start'
+							gs 'willpower', 'bj'
+							if will_cost <= pcs_willpwr:
+								act 'Refuse (<<will_cost>> Willpower)':
+									*clr & cla
+									gs 'willpower', 'resist'
+									'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
+									'You shake your head no. "I''m not sucking your dick for a beer Dan."'
+									'He laughs, "Then you''re not getting another beer." Knowing you won''t win this and you are not about to suck his dick for a beer you sigh and leave them.'
+									act 'Move away':gt 'pavComplex', 'start'
+								end
 							end
-											
-							act 'Agree':gt 'pavaptcourtev', 'suck3stooges'
-												
-							if grupTipe = 4:
-								act 'Threaten Dan':
-								*clr & cla
-								npc_rel['A10'] -= 2
-								grupvalue[4] += 1
-								alko += 1
-!!ToDo: code for adding willpower and or dom when we do something with them. This note is just so we remember to add it
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/dandick.jpg"></center>'
-								'You smile to Dan and reach over and grab his dick, but instead of stroking it, you dig your nails deeply into it, making him squirm and yell. Trying to pull away which only makes it hurt more. "Fuck <<$pcs_nickname>> let go before you rip my dick off!" Vitek and Vasily howl in laughter at this.'
-								'You give him a sadist little smile. "Give me a beer and I will let go." He gives you a dirty look but winces as you dig your nails in even harder, with that he quickly hands you another beer. You take your time taking another drink before releasing him.'
-								*nl
-								'He puts his dick away and spends the next several minutes complaining about how much his dick hurts. With the last of the beers drank, the boys get up and telling you they will see you later and then they move off to go do who knows what. They don''t invite you to join them, so you take the hint.'
-								act 'Move away':gt 'pavComplex', 'start'
+							act 'Agree': gt 'pavaptcourtev', 'suck3stooges'
+							gs 'willpower', 'drink'
+							if grupTipe = 4 and will_cost <= pcs_willpwr:
+								act 'Threaten Dan (<<will_cost>> Willpower)':
+									*clr & cla
+									npc_rel['A10'] -= 2
+									grupvalue[4] += 1
+									alko += 1
+									gs 'willpower', 'force'
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/dandick.jpg"></center>'
+									'You smile to Dan and reach over and grab his dick, but instead of stroking it, you dig your nails deeply into it, making him squirm and yell. Trying to pull away which only makes it hurt more. "Fuck <<$pcs_nickname>> let go before you rip my dick off!" Vitek and Vasily howl in laughter at this.'
+									'You give him a sadist little smile. "Give me a beer and I will let go." He gives you a dirty look but winces as you dig your nails in even harder, with that he quickly hands you another beer. You take your time taking another drink before releasing him.'
+									*nl
+									'He puts his dick away and spends the next several minutes complaining about how much his dick hurts. With the last of the beers drank, the boys get up and telling you they will see you later and then they move off to go do who knows what. They don''t invite you to join them, so you take the hint.'
+									act 'Move away':gt 'pavComplex', 'start'
+								end
 							end
 						end
-						act 'Make Bet':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
-							'You are feeling confident. "Fine you got a bet." The boys laugh, while Dan hands you and Vitek a beer and says. "Okay start drinking when I say so."'
-							'When both you and Vitek nod, Dan says. "Drink!"'
-							'You start guzzling the beer, you are keeping up with Vitek, maybe even winning. Just then Vasily pokes you in the stomach which causes you to sputter out some beer and slow you down. Before you can recover Vitek finishes.'
-							*nl
-							'Vasily laughs. "Okay, strip and pay up <<$pcs_nickname>>."'
-							'You give him a slight glare. "You cheated."'
-							'Holding up his hands. "We never said you couldn''t do something to make the other lose. So stop whining and pay up."'
-							act 'Refuse':
+					end
+					act 'Make bet':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
+						'You are feeling confident. "Fine you got a bet." The boys laugh, while Dan hands you and Vitek a beer and says. "Okay start drinking when I say so."'
+						'When both you and Vitek nod, Dan says. "Drink!"'
+						'You start guzzling the beer, you are keeping up with Vitek, maybe even winning. Just then Vasily pokes you in the stomach which causes you to sputter out some beer and slow you down. Before you can recover Vitek finishes.'
+						*nl
+						'Vasily laughs. "Okay, strip and pay up <<$pcs_nickname>>."'
+						'You give him a slight glare. "You cheated."'
+						'Holding up his hands. "We never said you couldn''t do something to make the other lose. So stop whining and pay up."'
+						gs 'willpower', 'exhib'
+						if will_cost <= pcs_willpwr:
+							act 'Refuse(<<will_cost>> Willpower)':
 								*clr & cla
+								gs 'willpower', 'resist'
 								npc_rel['A9'] -= 2
 								npc_rel['A10'] -= 2
 								npc_rel['A11'] -= 2
@@ -661,23 +743,23 @@ if $ARGS[0] = 'male_gopnik_beer':
 								'You know they will get over it eventually, most likely. You also know their is no point arguing with them, so you leave them to grumble about you welshing on your bet.'
 								act 'Move away':gt 'pavComplex', 'start'
 							end
-							act 'Payup':
-								*clr & cla
-								npc_rel['A9'] += 1
-								npc_rel['A10'] += 1
-								npc_rel['A11'] += 1
-								grupvalue[4] += 1
-								pav_sex += 2
-								gs 'flash', 'full', 'outdoors', 5
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/nudewalkb.jpg"></center>'
-								'You strip off your clothes, while the boys hoot and whistle. Once you are completely naked Vitek points to the garages. "Come on, start over there and walk all the way around the whole complex." You nod and walk over, with the boys following you, Vasily stops to grab you purse and clothes.'
-								*nl
-								'They follow behind you, laughing and talking seeming to enjoy the view. Occasionally a car drives by, the headlights lighting up your naked body. You notice a couple of people see you, their reactions range from disgust to interest but none of them approach or say anything.'
-								*nl
-								'Just before you get back to where you started, you notice you can''t hear the boys anymore. You turn back to look and they are gone. They took your clothes and left, you start back hoping they just stopped for a moment, but when you see your purse hanging from a handle of one of the garage doors you know they ditched you and took you clothes. Gathering up your purse you know you need to somehow make it back to the apartments without getting spotted.'
-								act 'Go home':gt 'pavaptcourtev', 'homenaked'
-							end
+						end
+						act 'Payup':
+							*clr & cla
+							npc_rel['A9'] += 1
+							npc_rel['A10'] += 1
+							npc_rel['A11'] += 1
+							grupvalue[4] += 1
+							pav_sex += 2
+							gs 'flash', 'full', 'outdoors', 5
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/nudewalkb.jpg"></center>'
+							'You strip off your clothes, while the boys hoot and whistle. Once you are completely naked Vitek points to the garages. "Come on, start over there and walk all the way around the whole complex." You nod and walk over, with the boys following you, Vasily stops to grab you purse and clothes.'
+							*nl
+							'They follow behind you, laughing and talking seeming to enjoy the view. Occasionally a car drives by, the headlights lighting up your naked body. You notice a couple of people see you, their reactions range from disgust to interest but none of them approach or say anything.'
+							*nl
+							'Just before you get back to where you started, you notice you can''t hear the boys anymore. You turn back to look and they are gone. They took your clothes and left, you start back hoping they just stopped for a moment, but when you see your purse hanging from a handle of one of the garage doors you know they ditched you and took you clothes. Gathering up your purse you know you need to somehow make it back to the apartments without getting spotted.'
+							act 'Go home':gt 'pavaptcourtev', 'homenaked'
 						end
 					end
 				end
@@ -698,7 +780,13 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/drinkbeerg' + rand(1,2) + '.jpg"></center>'
 	'You take the offered beer, taking a swig of it. You listen to the girls talking about their latest ventures, which range from vandalizing, beating some girl up, bulling some of the nerds and outcasts, or what boys they find cute. Occasionally you comment and as well, but you mostly just listen to them.'
-	act 'Stop drinking and leave':gt 'pavComplex', 'start'
+	gs 'willpower', 'drink'
+	if will_cost <= pcs_willpwr:
+		act 'Stop drinking and leave(<<will_cost>> Willpower)': 
+			gs 'willpower', 'resist'
+			gt 'pavComplex', 'start'
+		end
+	end
 	act 'Drink more':
 		*clr & cla
 		alko += 1
@@ -706,7 +794,13 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 		'You grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-		act 'Stop drinking and leave':gt 'pavComplex', 'start'
+		gs 'willpower', 'drink'
+		if will_cost <= pcs_willpwr:
+			act 'Stop drinking and leave(<<will_cost>> Willpower)':
+				gs 'willpower', 'resist'
+				gt 'pavComplex', 'start' 
+			end
+		end
 		act 'Drink even more':
 			*clr & cla
 			alko += 1
@@ -714,7 +808,13 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 			'You are starting to feel the effects of the beers but you are having to much fun. So you grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-			act 'Stop drinking and leave':gt 'pavComplex', 'start'
+			gs 'willpower', 'drink'
+			if will_cost <= pcs_willpwr:
+				act 'Stop drinking and leave(<<will_cost>> Willpower)': 
+					gs 'willpower', 'resist'
+					gt 'pavComplex', 'start'
+				end
+			end
 			act 'Grab another beer':
 				*clr & cla
 				alko += 1
@@ -725,7 +825,7 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 				*nl
 				'This seems to amuse them even more. "Yeah I bet you could down a beer faster than Alyona can, couldn''t you?" You give her a look wondering what she is up to but right now you feel like you could out drink anyone so you nod. "Yeah I think I could."'
 				'Lena grins widely. "Great then how about we make a bet, if you can out down one faster than Alyona, Lera will walk around the complex naked, but if you lose. You got to walk around the complex completely naked. What do you say?" Lera gives Lena a look of surprise but Lena just nods and Lera doesn''t say anything.'
-				act 'Make Bet':
+				act 'Make bet':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 					'You are feeling confident. "Fine you got a bet." The girls laugh, while Lena hands you and Alyona a beer and says. "Okay, start drinking when I say."'
@@ -735,20 +835,24 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 					'They all laugh, while Lera taunts. "Okay, strip and pay up <<$pcs_nickname>>."'
 					'You give him a slight glare. "You cheated."'
 					'Holding up her hands. "We never said you couldn''t do something to make the other lose. So stop whining and pay up."'
-					act 'Refuse':
-						*clr & cla
-						npc_rel['A20'] -= 3
-						npc_rel['A21'] -= 3
-						npc_rel['A44'] -= 3
-						npc_rel['A144'] -= 2
-						grupvalue[4] -= 3
-						minut += 2
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
-						'You shake your head no. "No you cheated."'
-						'Then Lera gives you a slight shove. "Then get the fuck out of here and don''t come back"'
-						'You know they will get over it eventually, most likely. You also know their is no point arguing with them, so you leave them to grumble about you welshing on your bet.'
-						act 'Move away':gt 'pavComplex', 'start'
+					gs 'willpower', 'exhib'
+					if will_cost <= pcs_willpwr:
+						act 'Refuse(<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'resist'
+							npc_rel['A20'] -= 3
+							npc_rel['A21'] -= 3
+							npc_rel['A44'] -= 3
+							npc_rel['A144'] -= 2
+							grupvalue[4] -= 3
+							minut += 2
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
+							'You shake your head no. "No you cheated."'
+							'Then Lera gives you a slight shove. "Then get the fuck out of here and don''t come back"'
+							'You know they will get over it eventually, most likely. You also know their is no point arguing with them, so you leave them to grumble about you welshing on your bet.'
+							act 'Move away':gt 'pavComplex', 'start'
+						end
 					end
 					act 'Payup':
 						*clr & cla
@@ -771,32 +875,43 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 						act 'Go home':gt 'pavaptcourtev', 'homenaked'
 					end
 				end
-				act 'Refuse bet':
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
-					'You shake your head no. "No I don''t think so, I wouldn''t win so no reason for me to make that bet." You reach for another beer but Lera pulls it away before you can grab it. Then he stands up and pulls her pants down enough to show off her clit. "If you want another beer you have to eat me <<$pcs_nickname>>." She says with a smirk. The other girls perk up at this and seem interested in what you''re going to do.'
-					act 'Refuse':
-						'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
-						'You shake your head no. "I''m not licking your pussy for a beer Lera."'
-						'She laughs, "Then you''re not getting another beer." Knowing you won''t win this and you are not about to lick her pussy for a beer you sigh and leave them.'
-						act 'Move away':gt 'pavComplex', 'start'
-					end
-					act 'Agree':gt 'pavaptcourtev', 'eatlera'
-					if grupTipe = 4:
-						act 'Threaten Lera':
-							*clr & cla
-							npc_rel['A21'] -= 2
-							grupvalue[4] += 1
-							alko += 1
-							minut += 5
-							gs 'stat'
-!!code for adding willpower and or dom when we do something with them. This note is just so we remember to add it
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
-							'You smile to Lera and reach over and pinch her clit between your index finger and thumb, which makes her squeal in pain, she grabs your arm with her hands. Trying to pull your hand away only makes it hurt more. "Fuck <<$pcs_nickname>> let go before you rip my clit off!" The other girls howl in laughter at this.'
-							*nl
-							'You give her a sadist little smile. "Give me a beer and I will let go." She gives you a dirty look but winces as you dig your nails in even harder, with that he quickly hands you another beer. You take your time taking another drink before releasing her.'
-							*nl
-							'She pulls her pants back up and spends the next several minutes complaining about how much her clit hurts. With the last of the beers drank, the girls get up and tell each other and you night. Then they each go their own way.'
-							act 'Move away':gt 'pavComplex', 'start'
+				gs 'willpower', 'exhib'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse bet':
+						*clr & cla
+						gs 'willpower', 'resist'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
+						'You shake your head no. "No I don''t think so, I wouldn''t win so no reason for me to make that bet." You reach for another beer but Lera pulls it away before you can grab it. Then he stands up and pulls her pants down enough to show off her clit. "If you want another beer you have to eat me <<$pcs_nickname>>." She says with a smirk. The other girls perk up at this and seem interested in what you''re going to do.' 
+						gs 'willpower', 'bj'
+						if will_cost <= pcs_willpwr:
+							act 'Refuse(<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'resist'
+								'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
+								'You shake your head no. "I''m not licking your pussy for a beer Lera."'
+								'She laughs, "Then you''re not getting another beer." Knowing you won''t win this and you are not about to lick her pussy for a beer you sigh and leave them.'
+								act 'Move away':gt 'pavComplex', 'start'
+							end
+						end
+						act 'Agree':gt 'pavaptcourtev', 'eatlera'
+						gs 'willpower', 'drink'
+						if grupTipe = 4 and will_cost <= pcs_willpwr:
+							act 'Threaten Lera (<<will_cost>> Willpower)':
+								*clr & cla
+								npc_rel['A21'] -= 2
+								grupvalue[4] += 1
+								alko += 1
+								minut += 5
+								gs 'willpower', 'force'
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
+								'You smile to Lera and reach over and pinch her clit between your index finger and thumb, which makes her squeal in pain, she grabs your arm with her hands. Trying to pull your hand away only makes it hurt more. "Fuck <<$pcs_nickname>> let go before you rip my clit off!" The other girls howl in laughter at this.'
+								*nl
+								'You give her a sadist little smile. "Give me a beer and I will let go." She gives you a dirty look but winces as you dig your nails in even harder, with that he quickly hands you another beer. You take your time taking another drink before releasing her.'
+								*nl
+								'She pulls her pants back up and spends the next several minutes complaining about how much her clit hurts. With the last of the beers drank, the girls get up and tell each other and you night. Then they each go their own way.'
+								act 'Move away':gt 'pavComplex', 'start'
+							end
 						end
 					end
 				end
@@ -816,7 +931,13 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/drinkbeerg' + rand(1,2) + '.jpg"></center>'
 	'You take the offered beer, taking a swig of it. You listen to the girls talking about their latest ventures, which range from vandalizing, beating some girl up, bulling some of the nerds and outcasts, gossip about other girls, which ones are sluts and the like, or what boys they find cute. Occasionally you comment and as well, but you mostly just listen to them.'
-	act 'Stop drinking and leave':gt 'pavComplex', 'start'
+	gs 'willpower', 'drink'
+	if will_cost <= pcs_willpwr:
+		act 'Stop drinking and leave(<<will_cost>> Willpower)': 
+			gs 'willpower', 'resist'
+			gt 'pavComplex', 'start'
+		end
+	end
 	act 'Drink more':
 		*clr & cla
 		minut += 5
@@ -824,7 +945,13 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 		'You grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-		act 'Stop drinking and leave':gt 'pavComplex', 'start'
+		gs 'willpower', 'drink'
+		if will_cost <= pcs_willpwr:
+			act 'Stop drinking and leave(<<will_cost>> Willpower)':
+				gs 'willpower', 'resist'
+				gt 'pavComplex', 'start' 
+			end
+		end
 		act 'Drink even more':
 			*clr & cla
 			minut += 5
@@ -832,7 +959,13 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 			'You are starting to feel the effects of the beers but you are having to much fun. So you grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-			act 'Stop drinking and leave':gt 'pavComplex', 'start'
+			gs 'willpower', 'drink'
+			if will_cost <= pcs_willpwr:
+				act 'Stop drinking and leave(<<will_cost>> Willpower)':
+					gs 'willpower', 'resist'
+					gt 'pavComplex', 'start'
+				end
+			end
 			act 'Grab another beer':
 				*clr & cla
 				minut += 5
@@ -840,6 +973,13 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 				'Now you are feeling pretty drunk, the girls seem to be amused by just how drunk you are. They exchange a few words that you can''t quite make out. Then Lena speaks up. "Hey <<$pcs_nickname>> have another." She says as she hands you another beer.'
+				gs 'willpower', 'drink'
+				if will_cost <= pcs_willpwr:
+					act 'Stop drinking and leave(<<will_cost>> Willpower)':
+						gs 'willpower', 'resist'
+						gt 'pavComplex', 'start' 
+					end
+				end
 				act 'Keep drinking':
 					*clr & cla
 					minut += 5
@@ -847,17 +987,21 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 					'They keep passing you beers now before you even finish the previous one and encouraging you to drink faster.'
-					act 'Had enough':
-						*clr & cla
-						npc_rel['A20'] -= 1
-						npc_rel['A21'] -= 1
-						npc_rel['A24'] -= 1
-						grupvalue[4] -= 1
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
-						'You shake your head no. "No thanks, I think I had enough. Thanks for the beers though."'
-						'With that you get up and stumble off, before you get really wasted.'
-						act 'Move away':gt 'pavComplex', 'start'
+					gs 'willpower', 'drink'
+					if will_cost <= pcs_willpwr:
+						act 'Had enough(<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'resist'
+							npc_rel['A20'] -= 1
+							npc_rel['A21'] -= 1
+							npc_rel['A24'] -= 1
+							grupvalue[4] -= 1
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
+							'You shake your head no. "No thanks, I think I had enough. Thanks for the beers though."'
+							'With that you get up and stumble off, before you get really wasted.'
+							act 'Move away':gt 'pavComplex', 'start'
+						end
 					end
 					act 'Try to keep up':
 						*clr & cla
@@ -870,17 +1014,21 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 						'You are completely wasted now, yet they still keep handing your beers and encouraging you to drink up.'
-						act 'Had enough':
-							*clr & cla
-							npc_rel['A20'] -= 1
-							npc_rel['A21'] -= 1
-							npc_rel['A24'] -= 1
-							grupvalue[4] -= 1
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
-							'You shake your head no. "No thanks, I think I had enough. Thanks for the beers though."'
-							'With that you get up and stumble off, barely able to walk at all.'
-							act 'Move away':gt 'pavComplex', 'start'
+						gs 'willpower', 'drink'
+						if will_cost <= pcs_willpwr:
+							act 'Had enough(<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'resist'
+								npc_rel['A20'] -= 1
+								npc_rel['A21'] -= 1
+								npc_rel['A24'] -= 1
+								grupvalue[4] -= 1
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
+								'You shake your head no. "No thanks, I think I had enough. Thanks for the beers though."'
+								'With that you get up and stumble off, barely able to walk at all.'
+								act 'Move away':gt 'pavComplex', 'start'
+							end
 						end
 						act 'Keep going':
 							*clr & cla
@@ -941,12 +1089,17 @@ if $ARGS[0] = 'follownush':
 				'You return the kiss and soon your hands are roaming all over each others bodies, before long she starts pulling her clothes off and encouraging you to do the same.'
 				gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
 				gs 'stat'
-				act 'This is going to far':
-					npc_rel['A144'] -= 1
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/complex/hey.jpg"></center>'
-					'You pull back from the kiss breaking it and pull back till her hands are no longer on you. "Uh sorry, but this is too public."'
-					'She rolls her eyes slightly. "Yeah whatever, anyways I should get going." With that she gets up and straightens up her clothes as she heads upstairs. Leaving you behind, with nothing to do but return to the courtyard.'
-					act 'Leave':gt 'pavComplex', 'start'
+				gs 'willpower', 'sex'
+				if will_cost <= pcs_willpwr:
+					act 'This is going to far(<<will_cost>> Willpower)':
+						*clr & cla
+						npc_rel['A144'] -= 1
+						gs 'willpower', 'resist'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/complex/hey.jpg"></center>'
+						'You pull back from the kiss breaking it and pull back till her hands are no longer on you. "Uh sorry, but this is too public."'
+						'She rolls her eyes slightly. "Yeah whatever, anyways I should get going." With that she gets up and straightens up her clothes as she heads upstairs. Leaving you behind, with nothing to do but return to the courtyard.'
+						act 'Leave':gt 'pavComplex', 'start'
+					end
 				end
 				act 'Undress':
 					*clr & cla
@@ -1180,6 +1333,12 @@ if $ARGS[0] = 'homenaked':
 		act 'Go upstairs':
 			*clr & cla
 			minut += 3
+			rand(1,10)
+			if nakedrand = 1: 
+				gt 'pavaptcourtev', 'two_boys'
+			elseif nakedrand = 2: 
+				gt 'pavaptcourtev', 'misha'
+			end
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/nakedhall2.jpg"></center>'
 			'Almost to the top of the stairs to your floor you hear voices. You freeze and look back down the stairs tempted to bolt back down them, but then the voices fade and you hear a door close. You sneak slowly up the stairs, glancing down the hall to make sure no one is around and you head for your apartment.'
@@ -1223,7 +1382,6 @@ if $ARGS[0] = 'naked_aptcomplex':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/aptstairsnaked.jpg"></center>'
 			'Once inside you sigh in relief, almost home finally. Taking a look around, you glance up the stairs and then slowly start creeping up them hoping no one suddenly comes out of their apartment or comes down the stairs, catching you naked.'
 			gs 'stat'
-
 			act 'Sneak to your apartment':
 				*clr & cla
 				minut += 22
@@ -1266,19 +1424,19 @@ if $ARGS[0] = 'two_boys':
 	'You turn around and see <<$boydesc[1]>> and <<$boydesc[2]>>, standing behind you. One of them taking your picture with his phone, while the other walks over and leans against your apartment door, so you open it. "Please guys, I just need to get inside. Please share those pictures."'
 	'The one taking the pictures laughs and keeps taking them, while his friends leers at you, looking over your whole body. "Well if you are going to run around like a whore, we should treat you like one. So how about you come over here and let us fuck you and we will keep your secret and you can be our little whore, what do you say?"'
 	gs 'stat'
-	
-	act 'Tell them no and go home':
-!!willpower
-		*clr & cla
-		pav_sex += 4
-		minut += 1
-		gs 'exhibitionism', 4
-		killvar 'pavapt_boyrand'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
-		'You shake your head no. "No, I''ll be your personal whore, now move out of my way."'
-		'He laughs and gets off the door. "Whatever you say, whore." With that, you pull open the door and go into your apartment, with their laughter echoing out in the hall. Nothing you can do now, hopefully, they share the images with anyone, or at least anyone you know. Sighing you walk down the hall to your bedroom.'
-		gs 'stat'
-		
+	gs 'willpower', 'gangbang'
+	if will_cost <= pcs_willpwr:
+		act 'Tell them no and go home(<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'resist'
+			pav_sex += 4
+			minut += 1
+			gs 'exhibitionism', 4
+			killvar 'pavapt_boyrand'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
+			'You shake your head no. "No, I''ll be your personal whore, now move out of my way."'
+			'He laughs and gets off the door. "Whatever you say, whore." With that, you pull open the door and go into your apartment, with their laughter echoing out in the hall. Nothing you can do now, hopefully, they share the images with anyone, or at least anyone you know. Sighing you walk down the hall to your bedroom.'
+			gs 'stat'
 !!this option should only show up if Sveta has another uniform	
 !!		act 'Put on spare uniform and Go back to school':
 !!			*clr & cla
@@ -1288,9 +1446,9 @@ if $ARGS[0] = 'two_boys':
 !!			'You change into your other school uniform quickly and then rush back to school.'
 !!this should take Sveta back to school missing one period
 !!		end
-		act 'Stay home': gt 'bedrPar'
+			act 'Stay home': gt 'bedrPar'
+		end
 	end
-	
 	act 'Agree':
 		*clr & cla
 		pav_sex += 2
@@ -1300,7 +1458,6 @@ if $ARGS[0] = 'two_boys':
 		'"Well to fuck you like the whore you are, of course." He barks with a laugh, with that they take you to their apartment. Once inside one of them pushes you down to your knees and the stand on each side of you, with obvious bulges in their pants from having hard-ons.'
 		gs 'arousal', 'foreplay', 2, 'exhibitionism'
 		gs 'stat'
-		
 		act 'Suck dick':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nsuck1.jpg"></center>'
@@ -1309,7 +1466,6 @@ if $ARGS[0] = 'two_boys':
 			gs 'arousal', 'hj', 2, 'sub', 'group'
 			minut -= 2
 			gs 'stat'
-			
 			act 'Switch dicks':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nsuck2.jpg"></center>'
@@ -1319,7 +1475,6 @@ if $ARGS[0] = 'two_boys':
 				gs 'arousal', 'hj', 3, 'sub', 'group'
 				minut -= 3
 				gs 'stat'
-				
 				act 'Tell them you are a vigin':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nanal1.jpg"></center>'
@@ -1334,7 +1489,6 @@ if $ARGS[0] = 'two_boys':
 					gs 'arousal', 'anal', 5, 'sub', 'group'
 					minut -= 5
 					gs 'stat'
-					
 					act 'Switch dicks':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nanal2.jpg"></center>'
@@ -1343,7 +1497,6 @@ if $ARGS[0] = 'two_boys':
 						gs 'arousal', 'anal', 5, 'sub', 'group'
 						minut -= 5
 						gs 'stat'
-						
 						act 'Back on your knees':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/ncum.jpg"></center>'
@@ -1364,7 +1517,6 @@ if $ARGS[0] = 'two_boys':
 								minut +2
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
 								'You leave the apartment behind and walk back to your apartment. You unlock the door and walk down the hall to your bedroom and are finally able to get cleaned up and dressed.'
-								
 !!this option should only show up if Sveta has another uniform	
 !!								act 'Put on spare uniform and Go back to school':
 !!									*clr & cla
@@ -1374,7 +1526,6 @@ if $ARGS[0] = 'two_boys':
 !!									'You change into your other school uniform quickly and then rush back to school.'
 !!this should take Sveta back to school missing one period
 !!								end
-								
 								act 'Stay home': gt 'bedrPar'
 							end
 						end
@@ -1470,13 +1621,11 @@ if $ARGS[0] = 'misha':
 	'You blush as he stares at your naked body, having been caught by someone you know. "Some girls at school stole my clothes." You explain to him, he snorts a laugh and shakes his head.'
 	'"Well you best get inside then." He tells you, as you go unlock the door as quickly as you can, as you go inside you think you hear him say. "Where were girls like that when I was in school." Rushing down the hall you go to your bedroom.'
 	gs 'stat'
-	
 	act 'Go to your bedroom':
 		*clr & cla
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
 		'You finally make it to your bedroom and are able to get dressed.'
-		
 !! this option should only show up if Sveta has another uniform
 !!		act 'Put on spare uniform and go back to school':
 !!			*clr & cla
@@ -1486,9 +1635,9 @@ if $ARGS[0] = 'misha':
 !!			'You change into your other school uniform quickly and then quickly rush back to school.'
 !!			!!this should take Sveta back to school missing one period
 !!		end
-		
 		act 'Stay home': gt 'bedrPar'
 	end
 end
+ 
 
 --- pavaptcourtev ---------------------------------

+ 1 - 5
locations/pavtrainhall.qsrc

@@ -46,11 +46,7 @@ if $ARGS[0] = '':
 		act 'Go to the ticket office': gt 'pavtrainhall', 'ticket'
 	end
 
-	if snarkozak = 1 and narkossista = 0 and narkozakday!day:
-		if money >= 1500:
-			act 'Find the drug dealer':gs 'events', 'snarkozaka'
-		end
-	end
+	if snarkozak = 1 and narkossista = 0 and narkozakday ! day and money >= 1500: act 'Find the drug dealer':gs 'events', 'snarkozaka'
 
 	if vokzalVork >= 1:
 		if cleZalDay ! daystart or cleMTDay ! daystart or cleWTDay ! daystart:

+ 30 - 1
locations/shortgs.qsrc

@@ -21,7 +21,36 @@ if $ARGS[0] = 'smoker':
 	end
 	if pcs_energy < 80: pcs_energy += 4
 	gs '$menu_obnovit'
-end &!--- smoker ---
+end
+
+!! smoke_joint - handles all changes which happen when PC smokes a joint
+!! use : gs 'shortgs', 'smoke_joint'
+if $ARGS[0] = 'smoke_joint':
+	joint -= 1
+	jointday = daystart
+	jointhour = hour
+	jointminut = minut + 5
+	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
+	else
+		pcs_hydra -= 10
+	end
+	if pcs_energy > 20: 
+		pcs_energy -= 20
+	else
+		pcs_energy = 0
+	end
+	gs 'stat'
+end
 
 !! following function counts the number of guys which PC slept with. 
 !! use func('shortgs','guy') or func('shortgs','guy',X) for subset (X can be 'A','B','C','AB','AC','BC')

+ 2 - 1
locations/stat.qsrc

@@ -501,7 +501,8 @@ if minut >= 60:
 	if amphWithdrawl > 169: amphWithdrawl = 1 & amphetamineBonus = 1 & amphCount = 0
 	if SLomka > 0 and pcs_mood > 10:SLomka += 1 & pcs_mood -= pcs_mood / 10
 	if SLomka > 100 and StrongNarkota <= 0:SLomka = 0 & SNarkTimes = 0
-
+	if jointhigh > 0: jointhigh -= 1
+	
 	if narkoman = 1 and narkday ! daystart:
 		pcs_health -= 5
 		pcs_willpwr -= 5

+ 3 - 2
locations/stat_display.qsrc

@@ -649,7 +649,8 @@ elseif siga > 0:
 	$stat_msg += '<BR><a href="exec:gs ''shortgs'',''smoker''"><font color=#0064FF><b>You have <<siga>> cigarettes.</b></font></a><BR>'
 end
 
-if smokeHour = hour and smokeday = day and smokeminut >= minut:$stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'
+if smokeHour = hour and smokeday = daystart and smokeminut >= minut: $stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'
+if jointhour = hour and jointday = daystart and jointminut >= minut: $stat_msg += '<BR><font color="green">You are smoking a joint.</font><BR>'
 
 if cheatNoSweat = 0:
 	if pcs_sweat < 0 : pcs_sweat = 0
@@ -1232,7 +1233,7 @@ if hour < meethour[2] and svidanie[2] = 1:$stat_msg += '<BR><<$loverdesc[2]>> wi
 if hour = meethour[2] and svidanie[2] = 1:$stat_msg += '<BR><b><font color="red"><<$loverdesc[2]>> is waiting for you by <<$streetev_home>>.</font></b>'
 if meetday[2] < daystart and svidanie[2] = 1:pcs_lovers_rel[2] -= 10 & svidanie[2] = 0
 
-if StrongNarkota > 20:$stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'
+if StrongNarkota > 20 or jointhigh > 0:$stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'
 if amphHigh > 0: $stat_msg += '<BR><b><font color="red">You feel a little wired.</font></b>'
 
 if alko > 0:

+ 1 - 1
locations/street.qsrc

@@ -146,7 +146,7 @@ else
 	'In the courtyard of your <a href="exec: gt ''etoexhib'', ''pos51''">apartment building</a>, you see several <a href="exec: minut += 1 & gt ''trashplace''">trash bins</a>.'
 end
 
-if SNarkPriton > 0:'The <a href="exec:minut += 5 & gt ''narkopriton''">drug house</a> is clearly recognizeable by the syringes and the trash that lies in front of it.'
+if SNarkPriton > 0:'The <a href="exec:minut += 5 & gt ''narkopriton''">drug house</a> is clearly recognizable by the syringes and the 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 ''sauna''">The Sauna</a> is a 10 minute walk away. Rumors say the sauna is just the front for a brothel.'
 
 if hour >= 20 or hour <= 4: