[changed] breaks in the school, reworked drug prices

[added] locations to smoke weed, cocaine to drug den
[fixed] a lot of stuff

locations/anushka.qsrc

@@ -110,7 +110,7 @@ if $ARGS[0] = 'plan':
 					end
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				'<br>You don''t have enough willpower to refuse.'
 			end
 			act 'Take a drink':
 				*clr & cla
@@ -118,6 +118,9 @@ if $ARGS[0] = 'plan':
 				npc_rel['A158'] += 1
 				grupvalue[4] += 1
 				minut += 3
+				gs 'drugs', 'alcohol',  'moonshine', 1
+				gs 'drugs', 'joint'
+				gs 'stat'
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img 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, choking and coughing from the burning liquid, which gets them both laughing; whatever it is, it''s much stronger than you expected. Anushka soon takes out a joint and lights it up, passing it around as well. After only a few drinks each, the flask is empty. The joint doesn''t last much longer and with the flask drunk and the joint smoked, you are feeling pretty buzzed and watch in dazed fascination as he pulls his pants down.' 
@@ -420,6 +423,8 @@ if $ARGS[0] = 'naked':
 			act 'Smoke the joint with her':
 				*clr & cla
 				npc_rel['A144'] += 1
+				gs 'drugs', 'joint'
+				gs 'stat'
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/weed.jpg"></center>'
 				'You smile and take it from her, taking a long drag from the joint. Maybe it will help take your mind off the thought of getting caught naked in a classroom by the school janitor. You pass it back and forth between you as you make small talk, listening to the machine steadily getting closer.'

locations/balkon.qsrc

@@ -1,7 +1,6 @@
 # balkon
 if $ARGS[0] = 'start':
-	cla
-	*clr
+	*clr & cla
 	$menu_loc = 'balkon'
 	$menu_arg = 'start'
 	menu_off = 0
@@ -53,11 +52,8 @@ if $ARGS[0] = 'start':
 	act 'Approach the railing':gt 'balkon2', 'niz'
 	
 	if siga >= 1:act 'Light a cigarette':gt 'balkon2', 'kurit'
-	
-	!!!Probably CV edition
-	if pcs_horny >= 50 and pcs_inhib > 30:
-		act 'Masturbate':gt 'balkon2', 'masopt'
-	end	
+	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt 'balkon', 'start'
+	if pcs_horny >= 50 and pcs_inhib > 30: act 'Masturbate':gt 'balkon2', 'masopt'	
 end
 
 --- balkon ---------------------------------

locations/din_bad.qsrc

@@ -152,6 +152,7 @@ if $ARGS[0] = 'd_bag':
 		'You are out of condoms.'
 	end
 	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 tabletki > 0 and pillsleft[ptype] > 0:
 		'You have <b><<tabletki>></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 tabletki	= 0 and pillsleft[ptype] > 0:

locations/drugs.qsrc

@@ -70,6 +70,7 @@ elseif $ARGS[0] = 'heroin':
 		if SNarkTimes > 1 and heroin_exp = 0: heroin_exp = 1
 	end
 	StrongNarkota += 25
+	narkozakday = day
 	pcs_mood = 100
 	pcs_health -= 10
 	gs 'stat'

locations/etoexhib.qsrc

@@ -1611,18 +1611,12 @@ if $ARGS[0] = 'pos52':
 	if temp > 90:'In the depths of the attic you hear a group of <a href="exec:gt ''etoexhib'', ''pos50''">teens</a> talking. It seems they do not notice you.'
 
 	act 'Go to the hallway':gt 'etoexhib', 'pos51'
-
-	act 'Go up to the roof':
-		cla
-		*clr
-		gs 'stat'
-		gt 'etoexhib', 'pos53'
-	end
+	act 'Go up to the roof': gt 'etoexhib', 'pos53'
 end
 
 if $ARGS[0] = 'pos53':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$metka = 'pos54'
+	$loc = 'etoexhib'
 	$menu_loc = 'etoexhib'
 	$menu_arg = 'pos53'
 	menu_off = 0
@@ -1642,6 +1636,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, $metka
 	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5

locations/events.qsrc

@@ -19,7 +19,7 @@ end
 
 if $ARGS[0] = 'read':
 	act 'Read a book':
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/books/book.jpg"></center>'
 
@@ -33,7 +33,7 @@ if $ARGS[0] = 'read':
 
 		if fantasybook > 0:
 			act 'Read fantasy book. There are <<fantasybook * 100>> pages left (1:00)':
-				cls
+				*clr & cla
 				fantasybook -= 1
 
 				if fantasybook = 0:totalbook += 1
@@ -73,7 +73,7 @@ if $ARGS[0] = 'read':
 
 		if womanbook > 0:
 			act 'Read Women''s Novel. There are <<womanbook * 100>> pages left (1:00)':
-				cls
+				*clr & cla
 				womanbook -= 1
 
 				if womanbook = 0:totalbook += 1
@@ -114,7 +114,7 @@ if $ARGS[0] = 'read':
 		'You have no magazines to read.'
 	else
 		act 'Read a magazine':
-			cls
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/books/book.jpg"></center>'
 
@@ -194,7 +194,7 @@ end
 
 if $ARGS[0] = 'read_porn':
 	act 'Read the porn magazine':
-		cls
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/shared/accessories/magazines/porn.jpg"></center>'
 
 		if pornMagazine = 1:
@@ -247,13 +247,13 @@ if $ARGS[0] = 'snkayf':
 end
 
 if $ARGS[0] = 'narkozakladka':
-	cls
+	*clr & cla
 	'<center><b>Shooting galleries</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'You decide to ask, and whether there are any dealers in Pavlovsk. To which the man replied, "Go to the train station platform, it will cost you though..."'
 	'And then he looks at you menacingly at you, "And if I hear that you''ve caused any trouble, well death will seem like a good escape."'
 	act 'Agree':
-		cls
+		*clr & cla
 		snarkozak = 1
 		'<center><b>Shooting galleries</b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
@@ -264,7 +264,7 @@ if $ARGS[0] = 'narkozakladka':
 end
 
 if $ARGS[0] = 'snarkozaka':
-	cls
+	*clr & cla
 	minut += 20
 	gs 'stat'
 	'<center><B>Pavlovsk train station</B></center>'
@@ -272,14 +272,18 @@ 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 'Leave': gt $loc, $metka
+	*nl
+	'Heroin: 560 <b>₽</b>'
+	'Cocaine: 2100 <b>₽</b>'
+	'Amphetamine: 600 <b>₽</b>'
+	'Weed: 300 <b>₽</b>'
 	
-	if money >= 1500:
-		act 'Buy heroin (1500 <b>₽</b>)':
-			money -= 1500
+	act 'Leave': gt 'events', 'snarkozaka'
+	
+	if money >= 560:
+		act 'Buy and use heroin (560 <b>₽</b>)':
+			money -= 560
 			gs 'drugs', 'heroin'
-			narkozakday = day
-			gs'stat'
 			'You buy the drugs and without thinking twice you shoot up.'
 			gt 'events', 'snkayf'
 		end
@@ -287,41 +291,37 @@ if $ARGS[0] = 'snarkozaka':
 		'You don''t have enough money to buy heroin.'
 	end
 	
-	if money >= 1000:
-		act 'Buy Amphetamine (5 for 1000 <b>₽</b>)':
-			money -= 1000
+	if money >= 2100:
+		act 'Buy enough cocaine for 5 lines (1800 <b>₽</b>)':
+			money -= 2100
+			dur += 5
+			minut += 5
+			gt 'narkopriton', 'cocaine'
+		end
+	else
+		'You don''t have enough money to buy cocaine.'
+	end
+	
+	if money >= 600:
+		act 'Buy 5 Amphetamine (600 <b>₽</b>)':
+			money -= 600
 			amphetamine += 5
-			gt $loc, $metka
+			gt 'events', 'snarkozaka'
 		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
+	if money >= 300:
+		act 'Buy enough weed for 5 joints (300 <b>₽</b>)':
+			money -= 300
 			drugUser = 1
-			joint += 1
+			joint += 5
 			minut += 5
-			gt $loc, $metka
+			gt 'events', 'snarkozaka'
 		end
 	else
-		'You don''t have enough money to buy a joint.'
+		'You don''t have enough money to buy weed.'
 	end
 end
 

locations/gadforest.qsrc

@@ -295,6 +295,8 @@ if $ARGS[0] = '1':
 	 	end
 	end
 
+	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $metka
+	
 	if goswamp = 1 and MiraLoc ! 3:
 		! day time chance to get stuck in swamp. ps. use bike to get there 100% of the time by illume
 		if hour >= 6 and hour < 20:

locations/gdk.qsrc

@@ -4,8 +4,8 @@ CLOSE ALL
 $menu_loc = 'gdk'
 $menu_arg = ''
 menu_off = 0
-$metka = $ARGS[0]
-$loc = $CURLOC
+$metka = ''
+$loc = $curloc
 $location_type = 'public_outdoors'
 gs 'stat'
 '<center><b><font color="maroon">Community Centre</font></b></center>'
@@ -49,8 +49,6 @@ if nerd_night_game = 1 and nerd_night_game_day = daystart and hour = 19:
 	act 'Wait for game night to start':
 		hour = 20
 		minut = 0
-		cls
-		gs'stat'
 		gt 'gdkbibl'
 	end
 end
@@ -58,6 +56,8 @@ if nerd_night_game = 1 and nerd_night_game_day = daystart and hour = 20: act 'Go
 
 if hour >= 8:act 'Go to the toilets': gt 'gdktoilet', 'start'
 
+if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $metka
+
 gs'family'
 
 --- gdk ---------------------------------

locations/gschool_break.qsrc

@@ -4,11 +4,6 @@ $loc = 'gschool_break'
 $locM = 'gschool_break'
 $menu_loc = 'gschool_break'
 
-!!All events either lead to the end of the break or the generic restroom
-$menu_arg = 'restroom'
-$metka = 'restroom'
-$metkaM = 'restroom'
-
 if $ARGS[0] = 'watercooler':
 	*clr & cla
 	minut += 2
@@ -61,16 +56,42 @@ if $ARGS[0] = 'watercooler':
 	end
 end
 
-!!Generic Restroom
-if $ARGS[0] = 'restroom':
+if $ARGS[0] = 'boys_restroom':
 	*clr & cla
+	$menu_arg = 'boys_restroom'
+	$metka = 'boys_restroom'
+	$metkaM = 'boys_restroom'
 	menu_off = 0
 	minut += 5
-	gs 'stat'
+	gs 'stat'	
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
 	'The restroom is empty.'
 	
 	gs 'gschool_break', 'restroom_actions'
+	
+	if school_brestday ! daystart and rand(0,4) = 4:
+		school_brestday = daystart
+		gt 'gschool_break', 'boys_restroom_events'
+	end
+end
+
+if $ARGS[0] = 'girls_restroom':
+	*clr & cla
+	$menu_arg = 'girls_restroom'
+	$metka = 'girls_restroom'
+	$metkaM = 'girls_restroom'
+	menu_off = 0
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
+	'The restroom is empty.'
+	
+	gs 'gschool_break', 'restroom_actions'
+	
+	if school_grestday ! daystart and rand(0,4) = 4:
+		school_grestday = daystart
+		gt 'gschool_break', 'girls_restroom_events'
+	end
 end
 
 if $ARGS[0] = 'restroom_actions':
@@ -86,10 +107,18 @@ if $ARGS[0] = 'restroom_actions':
 	gs 'din_van', 'pblc_pee'
 	act 'Use the mirrors': gt 'mirror', 'start'
 	if siga > 0: act 'Smoke': gt 'gschool_break', 'smoke1'
+	
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
+	dynamic $removepan
 end	
 
 if $ARGS[0] = 'girls_restroom_events':
 	*clr & cla
+	$menu_arg = 'girls_restroom'
+	$metka = 'girls_restroom'
+	$metkaM = 'girls_restroom'
 	minut += 2
 	girls_event_rand = rand(1,22)
 	if girls_event_rand = 1:
@@ -415,12 +444,15 @@ if $ARGS[0] = 'girls_restroom_events':
 			end
 		end
 	else
-		gt 'gschool_break', 'restroom'
+		gt $loc, $metka
 	end
 end
 		
 if $ARGS[0] = 'boys_restroom_events':
 	*clr & cla
+	$menu_arg = 'boys_restroom'
+	$metka = 'boys_restroom'
+	$metkaM = 'boys_restroom'
 	menu_off = 1
 	minut += 2
 	gs 'stat'
@@ -913,7 +945,7 @@ if $ARGS[0] = 'boys_restroom_events':
 									gs 'arousal', 'foreplay', 2
 									gs 'arousal', 'end'
 									gs 'stat'
-									act 'Continue': gt 'gschool_break', 'restroom'
+									act 'Continue': gt $loc, $metka
 								end
 							end
 						end
@@ -936,7 +968,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			end
 		end
 	else
-		gt 'gschool_break', 'restroom'
+		gt $loc, $metka
 	end
 end
 
@@ -992,7 +1024,7 @@ if $ARGS[0] = 'join_alylav':
 				gs 'arousal', 'voyeur', 2
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave the restroom': gt 'gschool_break', 'restroom'
+				act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
@@ -1006,7 +1038,7 @@ if $ARGS[0] = 'smoke1':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke<<rand(1,3)>>.jpg"></center>'
 	'You pull out your pack of cigarettes and fish out a cigarette. Placing it between your lips, you use your lighter to lite the cigarette and take a long slow drag on it. You spend a couple of minutes smoking the cigarette, before dropping the bud into the toilet.'
-	act 'Continue your break': gt 'gschool_break', 'restroom'
+	act 'Continue your break': gt $loc, $metka
 end
 	
 if $ARGS[0] = 'smoke2':
@@ -1193,9 +1225,7 @@ if $ARGS[0] = 'smoke2':
 		gs 'drugs', 'smoke'
 		gs 'stat'
 		
-		act 'Continue your break': gt 'gschool_break', 'restroom'
-		act 'Use the toilet': gt 'gschool_break', 'pee'
-		act 'Use the mirrors': gt 'mirror', 'start'
+		act 'Continue your break': gt $loc, $metka
 	end
 end
 
@@ -1237,7 +1267,7 @@ if $ARGS[0] = 'lena_gop':
 				gs 'arousal', 'vaginal_strap_give', 5, 'lesbian'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Continue your break': gt 'gschool_break', 'restroom'
+				act 'Continue your break': gt $loc, $metka
 			end
 		end
 		act 'Agree to take turns':
@@ -1270,7 +1300,7 @@ if $ARGS[0] = 'lena_gop':
 					gs 'arousal', 'vaginal_strap_give', 5, 'lesbian'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Continue your break': gt 'gschool_break', 'restroom'
+					act 'Continue your break': gt $loc, $metka
 				end
 			end
 		end
@@ -1297,7 +1327,7 @@ if $ARGS[0] = 'lena_dom':
 		gs 'arousal', 'cuni_give', 10, 'lesbian', 'sub'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Continue your break': gt 'gschool_break', 'restroom'
+		act 'Continue your break': gt $loc, $metka
 	end
 end	
 		

locations/gschool_chats1.qsrc

@@ -1,7 +1,5 @@
 # gschool_chats1
 	
-!!ToDo: Cocaine price has to be reworked
-	
 if $ARGS[0] = 'dimka':
 	*clr & cla
 	menu_off = 1
@@ -75,12 +73,12 @@ if $ARGS[0] = 'dim_drugs':
 	'You don''t want to but the you feel miserable and everything hurts, you crave the rush that you''ve come to enjoy so much'
 	'"Please Dimka, can I have some pale lady?"'
 	'He smiles at you with a smug knowing smile. "Sure do you have any money?"'
-	if money >= 2000:
+	if money >= 420:
 		act 'Change your mind': gt 'gschool_lessons', 'short_break'	
-		if money >= 2000: act 'Buy enough for 1 line (2000 <b>₽</b>)': palelady = 1 & gt 'gschool_chats1', 'dimka_pay'	
-		if money >= 4000: act 'Buy enough for 2 lines (4000 <b>₽</b>)': palelady = 2 & gt 'gschool_chats1', 'dimka_pay'
-		if money >= 10000: act 'Buy enough for 5 lines (10000 <b>₽</b>)': palelady = 5 & gt 'gschool_chats1', 'dimka_pay'		
-		if money >= 20000: act 'Buy enough for 10 lines (20000 <b>₽</b>)': palelady = 10 & gt 'gschool_chats1', 'dimka_pay'
+		if money >= 420: act 'Buy enough for 1 lines (420 <b>₽</b>)': palelady = 1 & gt 'gschool_chats1', 'dimka_pay'	
+		if money >= 840: act 'Buy enough for 2 lines (840 <b>₽</b>)': palelady = 2 & gt 'gschool_chats1', 'dimka_pay'
+		if money >= 1680: act 'Buy enough for 5 lines (1680 <b>₽</b>)': palelady = 5 & gt 'gschool_chats1', 'dimka_pay'		
+		if money >= 3720: act 'Buy enough for 10 lines (3320 <b>₽</b>)': palelady = 10 & gt 'gschool_chats1', 'dimka_pay'
 	else
 		*nl
 		'You bite your lower lip nervously and look down, as you shake you head. "No, but please can you just give me some now and I can pay you back later?" You beg him.'
@@ -93,7 +91,7 @@ end
 
 if $ARGS[0] = 'dimka_pay':
 	*clr & cla
-	money -= palelady * 2000
+	money -= palelady * 420
 	dur += palelady
 	palelady = 0
 	gs 'stat'

locations/gschool_grounds.qsrc

@@ -129,18 +129,12 @@ if $ARGS[0] = 'main':
 				if NikoEv = 10:
 					gt 'NikoDates', 'Walk Of Shame'
 				elseif minut <= 45:
-					act '<b>Go to class</b>':
-						gt 'gschool_grounds', 'bulding'
-					end
+					act '<b>Go to class</b>': gt 'gschool_grounds', 'bulding'
 				else
 					'You are late for school, you could rush to class or just skip until the second period.'
 					act '<b>Rush to class</b>':
 						demerit += 5
-	!!					if rand(0,4) = 0:
-	!!						gt 'gschool_leesons', 'late punishment'
-	!!					else
-							gt 'gschool_grounds', 'bulding'
-	!!					end
+						gt 'gschool_grounds', 'bulding'
 					end
 					act 'Skip class':
 						*clr & cla
@@ -155,11 +149,7 @@ if $ARGS[0] = 'main':
 			elseif hour = 8:
 				if NikoEv = 10:gt 'NikoDates', 'Walk Of Shame'
 				'You missed your whole first class, hopefully no one noticed.'
-				act '<b>Rush to class</b>':
-					demerit += 10
-					gt 'gschool_grounds', 'bulding'
-!!					gs 'gschool_lessons', 'morning'   !This skips all the teacher morning interactions.
-				end
+				act '<b>Rush to class</b>':	demerit += 10 & gt 'gschool_grounds', 'bulding'
 			elseif hour < 14:
 				'It''s too late for school now. You have been marked as absent today.'
 			end
@@ -172,6 +162,8 @@ 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, $metka
+	
 	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and schoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 
 	if zverRageQW = 1:gt 'gschool_grounds', 'KristinaFight'

locations/gschool_lessons.qsrc

@@ -33,17 +33,15 @@ if $ARGS[0] = 'morning':
 			gs 'gschool_gossip', 'morning'
 			*nl			
 			gs 'gschool_lessons', 'uniform_check'
-			*nl
 			gs 'gschool_schedule'
 			act 'Go to first period': school_period = 0 & gt 'gschool_lessons', 'schedule'
 			act 'Skip first period': school_period = 1 & gt 'gschool_lessons', 'skip'
 
 			act 'Use water cooler': $breaktype = 'first' & gt 'gschool_break', 'watercooler'
-			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'restroom'
-			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'restroom'
+			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
+			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
 		end
 	else
-		killvar 'breaktype'
 		'<center><b><font color="maroon">School Hallway</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
 		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to.'
@@ -225,6 +223,7 @@ if $ARGS[0] = 'short_break':
 end
 
 if $ARGS[0] = 'skip':
+	killvar '$breaktype'
 	*clr & cla
 	$menu_loc = 'gschool_lessons'
 	$menu_arg = 'skip'

locations/gschool_lunch.qsrc

@@ -146,19 +146,19 @@ if $ARGS[0] = 'break':
 			gt 'gschool_lunch', 'events'
 		end
 		
-		if school_period = 6:
+		if school_period = 6: 
 			if lunch_event ! daystart: lunch_event = daystart & gt 'gschool_lunch', 'events'
 			if soniaPS = 2: soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
 
-			act 'Use water cooler': $breaktype = 'long' & gt 'gschool_break', 'watercooler'
-			act 'Go to the girls restroom': $breaktype = 'long' & gt 'gschool_break', 'girls_restroom_events'
-			act 'Go to the boys restroom': $breaktype = 'long' & gt 'gschool_break', 'boys_restroom_events'
+			act 'Use water cooler': $breaktype = 'long' &  gt 'gschool_break', 'watercooler'
+			act 'Go to the girls restroom': $breaktype = 'long' & gt 'gschool_break', 'girls_restroom'
+			act 'Go to the boys restroom': $breaktype = 'long' & gt 'gschool_break', 'boys_restroom'
 		else
 			if soniaPS = 2: soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
 
 			act 'Use water cooler': $breaktype = 'short' & gt 'gschool_break', 'watercooler'
-			act 'Go to the girls restroom': $breaktype = 'short' &  & gt 'gschool_break', 'restroom'
-			act 'Go to the boys restroom': $breaktype = 'short' &  & gt 'gschool_break', 'restroom'
+			act 'Go to the girls restroom': $breaktype = 'short' & gt 'gschool_break', 'girls_restroom'
+			act 'Go to the boys restroom': $breaktype = 'short' & gt 'gschool_break', 'boys_restroom'
 		end
 	end
 
@@ -184,7 +184,6 @@ if $ARGS[0] = 'break':
 				act 'Wake him': gt 'gschool_lunch', 'rolan_meet'
 			elseif rolanmeet < 8:
 				act 'Look for Rolan': gt 'gschool_lunch', 'rolan_meet'
-			else
 			end
 		end
 	end
@@ -204,7 +203,6 @@ end
 
 if $ARGS[0] = 'marcus_event':
 	menu_off = 1
-!!Marcus event, is unlocked if Sveta has had sex with him or she agreed to date him, say 1 in 4 chance he approaches her if they are dating(by dating I mean she agreed to give him her phone number after the detention scene or the eventual after school walk her home that will be coming) and 1 in 8 if they have only had sex.
 	marcus_event = daystart
 	*clr & cla
 	gs'stat'
@@ -213,47 +211,63 @@ if $ARGS[0] = 'marcus_event':
 	'You can''t help but smile and shake your head a little, you can tell by the way his eyes roam all over your body that despite his compliments there is only one thing on his mind right now right now. If the way he''s flirting wasn''t obvious enough, the bulge straining against his pants is a dead give away. "Well you''re not looking too bad yourself Marcus and by the look of things, you sure are VERY happy to see me." You say with a giggle and deliberately staring at his crotch.'
 	*nl
 	'He blushes slightly and pulls out his shirt so it hangs over his crotch, trying to hide his erection a little. "Oh fuck, sorry about that. I just had two girls in my last class who took turns flashing me. I swear those girls get a huge kick out of teasing me." He looks around a bit and then leans in a little close to you and says softly. "Hey, think you might be able to you know... help me out with this?" He says indicating the evident bulge in his pants.'
-	act 'Make excuse and go':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/27.jpg"></center>'
-		'"Sorry Marcus but I got some stuff I got to do, maybe some other time?" You can see he is fairly disappointed but he nods in agreement.'
-		'"Sure not a problem, talk to you later then?"'
-		'"Yeah, talk to you later." With that you walk off.'
-		act 'Go to lunch': gt 'gschool_lunch', 'lunch'
+	gs 'willpower', 'bj'
+	will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr:
+		act 'Make excuse and go (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'bj'
+			will_cost = will_cost / 2
+			gs 'willpower', 'resist'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/27.jpg"></center>'
+			'"Sorry Marcus but I got some stuff I got to do, maybe some other time?" You can see he is fairly disappointed but he nods in agreement.'
+			'"Sure not a problem, talk to you later then?"'
+			'"Yeah, talk to you later." With that you walk off.'
+			act 'Go to lunch': gt 'gschool_lunch', 'lunch'
+		end
 	end
-	act 'Not today':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/27.jpg"></center>'
-		'You shake your head no. "Sorry not today Marcus."'
-		'He nods his head in understanding. "Yeah ok, not a problem. I figured, you know it wouldn''t hurt to ask, but don''t worry about it. But hey you want to sit with me at lunch and talk?"'
-		act 'Yeah that would be nice':
+	gs 'willpower', 'bj'
+	if will_cost <= pcs_willpwr:	
+		act 'Not today (<<will_cost>> Willpower)':
 			*clr & cla
-			npc_rel['A146'] += 4
+			gs 'willpower', 'bj'
+			gs 'willpower', 'resist'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
-			'"Sure I would love that." With that, the two of you walk to the lunch room together.'
-			'As you stand in line talking he asks you. "You want something to eat? My treat."'
-			act 'Yes':
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/27.jpg"></center>'
+			'You shake your head no. "Sorry not today Marcus."'
+			'He nods his head in understanding. "Yeah ok, not a problem. I figured, you know it wouldn''t hurt to ask, but don''t worry about it. But hey you want to sit with me at lunch and talk?"'
+			act 'Yeah that would be nice':
 				*clr & cla
-				pcs_energy += 40
-				pcs_health += 10
-				fat += 3
-				pcs_hydra += 40
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
+				npc_rel['A146'] += 4
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
-				'"Yes thank you Marcus, that is sweet." With that he buys both your lunches, you find a table and sit while you eat and talk for the whole lunch period.'
-				act 'Continue': gt 'gschool_lessons', 'short_break'
-			end
-			act 'No':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
-				'"I''m not hungry thank you anyway Marcus, but I would love to sit with you." With that he buys his lunch, you find a table and sit together. While he eats his lunch, the two of you talk for the whole lunch period.'
-				act 'Continue': gt 'gschool_lessons', 'short_break'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
+				'"Sure I would love that." With that, the two of you walk to the lunch room together.'
+				'As you stand in line talking he asks you. "You want something to eat? My treat."'
+				act 'Yes':
+					*clr & cla
+					pcs_energy += 40
+					pcs_health += 10
+					fat += 3
+					pcs_hydra += 40
+					cumspclnt = 2
+					gs 'cum_cleanup'
+					pcs_breath = 0
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
+					'"Yes thank you Marcus, that is sweet." With that he buys both your lunches, you find a table and sit while you eat and talk for the whole lunch period.'
+					act 'Continue': gt 'gschool_lessons', 'short_break'
+				end
+				act 'No':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
+					'"I''m not hungry thank you anyway Marcus, but I would love to sit with you." With that he buys his lunch, you find a table and sit together. While he eats his lunch, the two of you talk for the whole lunch period.'
+					act 'Continue': gt 'gschool_lessons', 'short_break'
+				end
 			end
 		end
+	else
+		'<br>You don''t have enough willpower to refuse.'
 	end
 	act 'Help him out':
 		*clr & cla
@@ -277,6 +291,12 @@ if $ARGS[0] = 'marcus_event':
 				gs 'stat'
 				'With a loud sigh, he leans back against the teacher''s desk. "Fuck yeah, thanks <<$pcs_nickname>> I really needed that. Hey, why don''t you come sit with me at lunch? I will even buy you some lunch, if you are not already full." He adds with a smirk.'
 				'You can''t help but rolling your eyes at that as you do the best you can to clean yourself up, <i>Jesus, your whole face is nearly coated in his cum</i>. You can''t believe it all came from just one guy. Sitting with him at lunch sounds nice, but he does kinda have a point. Do you really want anything to eat, well anything else to eat that is?'
+				act 'No':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
+					'"I''m not really hungry Marcus, but thank you anyway, I would love to sit with you." With that, the two of you walk to the cafeteria together. He buys his lunch, you find a table and sit together while he eats, you talk for the rest lunch time.'
+					act 'Continue': gt 'gschool_lessons', 'short_break'
+				end
 				act 'Yes':
 					*clr & cla
 					pcs_energy += 40
@@ -291,12 +311,6 @@ if $ARGS[0] = 'marcus_event':
 					'"Sure, I would love to have lunch with you! After all you wasted most of it on my face and tits!" With that, the two of you burst in laughter and you walk into the cafeteria together. He buys lunch for both, you find a table and sit together while you eat and talk for the rest lunch time.'
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
-				act 'No':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
-					'"I''m not really hungry Marcus, but thank you anyway, I would love to sit with you." With that, the two of you walk to the cafeteria together. He buys his lunch, you find a table and sit together while he eats, you talk for the rest lunch time.'
-					act 'Continue': gt 'gschool_lessons', 'short_break'
-				end
 			end
 		end
 	end
@@ -338,18 +352,115 @@ if $ARGS[0] = 'events':
 				end
 			end
 		end
-	!elseif pav_slut >= 75 and kotovLoveQW <= 0:
-		!gt 'gschool_lunch', 'bjs'
+	elseif pav_slut >= 75 and kotovLoveQW <= 0 rand(0,2) = 0:
+		cla & nl
+		lunch_sexrand = rand(0,2)
+!!This is only a lackluster placeholder, because the text was missing (julzor)		
+		'One of the boys approaches you during the lunch break. "Hi, <<$pcs_nickname>>," he greets you with a mischievous grin. "I''m bored, how about you and I have some fun?"'
+		
+		if lunch_sexrand = 0:
+			gs 'willpower', 'bj'
+		else
+			gs 'willpower', 'sex'
+		end
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				if lunch_sexrand = 0:
+					gs 'willpower', 'bj'
+				else
+					gs 'willpower', 'sex'
+				end
+				gs 'willpower', 'resist'
+				gt 'gschool_lunch', 'break'
+			end
+		else
+			'<br>You don''t have enough willpower to refuse.'
+		end
+		
+		if lunch_sexrand = 0:
+			gs 'willpower', 'bj'
+		else
+			gs 'willpower', 'sex'
+		end
+		will_cost = will_cost * 2
+		if will_cost <= pcs_willpwr:
+			act 'Slap him (<<will_cost>> Willpower)':
+				cla & *nl
+				if lunch_sexrand = 0:
+					gs 'willpower', 'bj'
+				else
+					gs 'willpower', 'sex'
+				end
+				will_cost = will_cost * 2
+				gs 'willpower', 'force', 'self'
+				if pav_sex < pav_prostitute:
+					gs 'fame', 'pav', 'prostitute', -2
+				else
+					gs 'fame', 'pav', 'sex', -2
+				end
+				'With his eyes fixed on your tits he doesn''t see it coming. His head jerks to the side when you slap him hard. "I don''t know what you heard about me, but I''m not that kind of girl," you scream. He doesn''t have a chance to react before you turn around on your heel and walk away.'
+				act 'Continue': gt 'gschool_lunch', 'break'
+			end
+		else
+			'<br>You don''t have enough willpower to slap him.'
+		end	
+					
+		act 'Go with him': 
+			gs 'fame', 'sex', 'pav', 1
+			if lunch_sexrand = 0:
+				gt 'gschool_sex', 'lunch_sex'
+			else
+				gt 'gschool_sex', 'lunch_bj'
+			end
+		end
+		
+		if pav_sex < pav_prostitute:
+			gs 'willpower', 'prostitution'
+			if will_cost <= pcs_willpwr:
+				act 'Demand money (<<will_cost>> Willpower)': 
+					cla & *nl
+					slutty += 1
+					gs 'fame', 'pav', 'prostitution', 1
+					'He gives you a puzzled look, but after a few seconds of silence, he says: "Fine," and hands you '+iif(lunch_sexrand = 0, '200 <b>₽</b>.', '50 <b>₽</b>.')
+					if lunch_sexrand = 0:
+						money += 50
+					else
+						money += 200
+					end
+					gs 'willpower', 'prostitution'
+					gs 'willpower', 'resist'
+					gs 'stat'
+					act 'Continue':
+						if lunch_sexrand = 0:
+							gt 'gschool_sex', 'lunch_sex'
+						else
+							gt 'gschool_sex', 'lunch_bj'
+						end
+					end
+				end
+			else
+				'<br>You don''t have enough willpower to ask for money.'
+			end	
+		end
 	elseif (Anush_lunch > 0 or grupTipe = 4) and rand(0,5) = 0:
 		pcs_horny += 20
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/school/want.jpg"></center>'
 		'As you are leaving the canteen, Anushka grabs you and pushes you up against the wall. She starts kissing you passionately, while one of her hands slides up your skirt and starts rubbing your clit. You can hear several of your fellow classmates whistling, hooting and hollering, but right now you don''t really care. She breaks the kiss just long enough to moan into your ear. "I want to fuck you, come with me," her fingers sliding up into your pussy as she says it.'
-		act 'Not today':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nomake.jpg"></center>'
-			'You are barely able to tear yourself away, mostly because you don''t really want to, but after struggling with yourself for a bit you finally manage to break away and shake your head at Anushka. "I''m sorry but I can''t right now... sorry." With that you hurry away.'
-			act 'Continue': gt 'gschool_lunch', 'break'
+		
+		gs 'willpower', 'sex'
+		if will_cost <= pcs_willpwr:
+			act 'Not today (<<will_cost>> Willpower)': 
+				*clr & cla
+				gs 'willpower', 'resist'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nomake.jpg"></center>'
+				'You are barely able to tear yourself away, mostly because you don''t really want to, but after struggling with yourself for a bit you finally manage to break away and shake your head at Anushka. "I''m sorry but I can''t right now... sorry." With that you hurry away.'
+				act 'Continue': gt 'gschool_lunch', 'break'
+			end
+		else
+			'<br>You don''t have enough willpower to refuse.'
 		end
+		
 		act 'Go with it':
 			*clr & cla
 			Anush_lunch = 2
@@ -363,12 +474,22 @@ if $ARGS[0] = 'events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 		'As you stop by your locker after lunch, Anushka comes over and rests against the locker next to yours. She leans in close to you "Hey <<$pcs_nickname>>, you wanna come have some fun? The boys brought something special and they are waiting for us in one of the unused classrooms." By the look in her eye and the way she is acting, you know exactly what she means by having fun with the boys.'
 		act 'Not today':
-			*clr & cla
-			grupvalue[4] -= 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
-			'You think a moment about it but decide that you have other things you need to do. So you shake your head. "Sorry Nush not today, maybe some other time, I got some stuff I need to do."'
-			'She gives a little shrug "Whatever." Then she turns and walks off. Leaving you behind wondering if you made the right decision.'
-			act 'Continue': gt 'gschool_lunch', 'break'
+
+		end
+		gs 'willpower', 'sex'
+		if will_cost <= pcs_willpwr:
+			act 'Not today (<<will_cost>> Willpower)': 
+				*clr & cla
+				gs 'willpower', 'resist'
+				gs 'stat'
+				grupvalue[4] -= 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
+				'You think a moment about it but decide that you have other things you need to do. So you shake your head. "Sorry Nush not today, maybe some other time, I got some stuff I need to do."'
+				'She gives a little shrug "Whatever." Then she turns and walks off. Leaving you behind wondering if you made the right decision.'
+				act 'Continue': gt 'gschool_lunch', 'break'
+			end
+		else
+			'<br>You don''t have enough willpower to refuse.'
 		end
 		act 'Go somewhere private':gt 'gschool_sex', 'Anush_private2'
 	elseif gruptipe = 4 and rand(0,3) = 0:

locations/gschool_sex.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = 'suck':
 		end
 		gs 'willpower', 'bj'
 		will_cost = will_cost / 2
-		if gruptipe = 4 and will_cost <= pcs_willpower:
+		if gruptipe = 4 and will_cost <= pcs_willpwr:
 			act 'Not today boys (<<will_cost>> willpower)':
 				*clr & cla
 				gs 'willpower', 'bj'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'suck':
 				*nl
 				'Seeing you do that, you are sure they are returning the favor as they tell you to fuck off and call you a variety of names but you don''t care, it was to funny to see the expression on their faces.'
 			end
-		elseif gruptipe = 4 and will_cost > pcs_willpower:
+		elseif gruptipe = 4 and will_cost > pcs_willpwr:
 			'<br>You don''t have enough willpower to refuse.'
 		end
 		gs 'willpower', 'bj'
@@ -562,7 +562,7 @@ if $ARGS[0] = 'rand_sex':
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool7.jpg"></center>'
 				'<<$boydesc>> pulls you up from the window sill, and tells you to get down on your knees before him. "Open your mouth, <<$pcs_nickname>>", he says and you happily oblige. He shoves his dick inside your mouth, and you enthusiastically begin to suck him off, wanting to feel him squirt his load. Unable to withstand your sweet torture any longer, <<$boydesc>> growls and you feel the squirts of his cum land on your tongue. It was too much for you, and some of it dribbles down your chin and onto your chest despite your best efforts to swallow it all.'
-				''
+				*nl
 				'After he admires his handiwork for a second, he notices the time, "Oh crap! <<$pcs_nickname>>, we''re going to be late for class!"'
 				'You both get dressed as quickly as you can, and run as fast as you can to make it to class on time.'
 				act 'Continue': gt 'gschool_lessons', 'short_break'
@@ -594,7 +594,7 @@ if $ARGS[0] = 'rand_sex':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool6.jpg"></center>'
 					'After a few minutes, he tells you to get up and squat over his hips. Without ever taking his dick out of your ass, you turn around and lean back for a second, your buttocks resting on his lower abdomen even though you''re carrying most of your weight on your arms. You can tell he''s impressed, not knowing what to do for just a moment.'
 					'Then he starts to pound your asshole furiously, driving his full length into your ass again and again. Not able to take any more you collapse in orgasm, falling back against him. He wraps his arms around your chest while you moan loudly, and keeps pounding your ass until he shoots his load. You feel a warm liquid spreading inside you. When he finally pulls out, a slow trail of cum is leaking from your well-stretched hole.'
-					''
+					*nl
 					'After he admires his handiwork for a second, he notices the time, "Oh crap! <<$pcs_nickname>>, we''re going to be late for class!"'
 					'You both get dressed as quickly as you can, and run as fast as you can to make it to class on time.'
 					gs 'cum_call', 'anus', $boy, 1
@@ -629,7 +629,7 @@ if $ARGS[0] = 'lunch_bj':
 			'He doesn''t last long; within a few minutes you feel his cum squirting in your mouth. You quietly swallow it all and release his cock, giving it a cute kiss before letting him tuck it back into his pants. "Oh my god! that was great <<$pcs_nickname>>, you really know how to suck cock. Thanks I really needed that, don''t worry I won''t tell anyone." He says with a wink and gives you a quick kiss, before he hurries out of the bathroom. After he leaves you take a moment to check yourself out in the mirror, making sure your hair and makeup is good. As you leave, you can''t help but feel good about giving the guy a day at school he will likely never forget.'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Continue': gt 'gschool_lessons', 'short_break'
+			act 'Continue': gt 'gschool_lunch', 'break'
 		end
 	end
 end
@@ -654,15 +654,22 @@ if $ARGS[0] = 'lunch_sex':
 		'Holding your hips tight with his hands as he fucks you, he leans forward. "<<$pcs_nickname>> can I fuck you in the ass?"'
 		gs 'arousal', 'vaginal', 10, 'unknown'
 		gs 'stat'
-		act 'No': 
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/roofvag.jpg"></center>'
-			'You shake your head no. "No, just fuck me."'
-			'"Ok" He sounds a little disappointed you can tell he was really hoping you would let him fuck your ass, but you don''t care. A few minutes later he pulls out of and begins to stand up.'
-			gs 'arousal', 'vaginal', 10, 'unknown'
-			gs 'stat'
+		gs 'willpower', 'anal'
+		if will_cost <= pcs_willpwr:			
+			act 'No (<<will_cost>> Willpower)': 
+				*clr & cla
+				gs 'willpower', 'resist'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/roofvag.jpg"></center>'
+				'You shake your head no. "No, just fuck me."'
+				'"Ok" He sounds a little disappointed you can tell he was really hoping you would let him fuck your ass, but you don''t care. A few minutes later he pulls out of and begins to stand up.'
+				gs 'arousal', 'vaginal', 10, 'unknown'
+				gs 'stat'
 
-			act 'Swallow': gt 'gschool_sex', 'lunch_sex2'
+				act 'Swallow': gt 'gschool_sex', 'lunch_sex2'
+			end
+		else
+			'<br>You don''t have enough willpower to refuse.'
 		end
 		act 'Yes':
 			*clr & cla
@@ -687,7 +694,7 @@ if $ARGS[0] = 'lunch_sex2':
 	'He stands up and starts jerking his dick, you kneel in front of him and open your mouth, within a few minutes you feel his cum squirting in your mouth. You quickly swallow it all. "Oh my god! that was great <<$pcs_nickname>>, you really know how to fuck. Thanks I really needed that, don''t worry I won''t tell anyone." He says with a wink and gives you a quick kiss, before he quickly gets dressed and hurries off the roof. After he leaves you take a moment to check yourself out, after getting dressed, making sure your hair and makeup is good. As you leave, you can''t help but feel good about giving the guy a day at school he will likely never forget.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Continue': gt 'gschool_lessons', 'short_break'
+	act 'Continue': gt 'gschool_lunch', 'break'
 end
 
 --- gschool_sex ---------------------------------

locations/gskver.qsrc

@@ -189,7 +189,9 @@ if $ARGS[0] = 'start':
 	end
 
 	act 'Sit down on the bench': gt'placer_sex','sitting_park_bench'
-
+	
+	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $metka
+	
 	if (hour >= 20 or hour < 6) and pcs_sleep <= 40:
 		if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
 			!nowhere to live in town

locations/metro.qsrc

@@ -207,13 +207,13 @@ if $ARGS[0] = 'shop':
 		end
 		'Uses left: <<aphrodisiac_have>>'
 	end
-	if money >= 50:
-		'<a href="exec:money -= 50 & joint += 1 & gt ''metro'', ''shop''">Buy a joint</a> for 50 <b>₽</b>'
+	if money >= 250:
+		'Buy enough <a href="exec:money -= 250 & joint += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <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>'
+		'Buy enough <a href="exec:money -= 250 & joint += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <b>₽</b>'
+		'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 5 joints for 500 <b>₽</b>'
 	else
-		'Buy a joint 50 <b>₽</b> (You do not have enough money)'
+		'Buy a enough weed for 5 joints for 250 <b>₽</b> (You do not have enough money)'
 	end
 end
 

locations/narkopriton.qsrc

@@ -12,7 +12,6 @@ menu_off = 1
 act 'Get out of here': minut += 5 & gt 'street'
 act 'You roll your eyes and push the door open': gt 'narkopriton', 'start'
 
-
 if $ARGS[0] = 'start':
 	*clr & cla
 	'<center><b>Local drug den</b></center>'
@@ -23,12 +22,8 @@ if $ARGS[0] = 'start':
 		act 'Ask for heroin': gt 'narkopriton', 'heroin'
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
 		act 'Ask for weed': gt 'narkopriton', 'joints'
-		if StoryLine = 1 and snarkozak = 0:
-			act 'Ask for a drop-off point in Pavlovsk':
-				minut +=5
-				gs 'events', 'narkozakladka'
-			end
-		end
+		act 'Ask for cocaine': gt 'narkopriton', 'cocaine'
+		if StoryLine = 1 and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
 	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."'
@@ -36,6 +31,7 @@ if $ARGS[0] = 'start':
 		act 'Ask for heroin': gt 'narkopriton', 'heroin'
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
 		act 'Ask for weed': gt 'narkopriton', 'joints'
+		act 'Ask for cocaine': gt 'narkopriton', 'cocaine'
 	elseif (StrongNarkota > 23 and ampHigh > 23) or ampHigh > 23 or StrongNarkota > 23:
 		gt 'narkopriton', 'kiteHigh'
 	end
@@ -52,7 +48,7 @@ if $ARGS[0] = 'amphetamine':
 	'You have <<amphetamine>> pills.'
 	act 'Leave the drug den': minut += 5 & gt 'street'
 	if money >= 1600:
-		act 'Buy 20 (1600 <b>₽</b>)':
+		act 'Buy 20 (1,600 <b>₽</b>)':
 			money -= 1600
 			drugUser = 1
 			amphetamine += 20
@@ -78,17 +74,9 @@ if $ARGS[0] = 'amphetamine':
 			gt 'narkopriton', 'amphetamine'
 		end
 	end
-	if money >= 80:
-		act 'Buy 1 (80 <b>₽</b>)':
-			money -= 80
-			drugUser = 1
-			amphetamine += 1
-			minut += 5
-			gt 'narkopriton', 'amphetamine'
-		end
-	end
 	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
-	act 'Buy some joints instead': gt 'narkopriton', 'joints'
+	act 'Buy some weed instead': gt 'narkopriton', 'joints'
+	act 'Buy some cocaine instead': gt 'narkopriton', 'cocaine'
 end
 
 if $ARGS[0] = 'joints':
@@ -96,11 +84,11 @@ if $ARGS[0] = 'joints':
 	gs 'stat'
 	'<center><b>Local drug den</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
-	'"That''ll be 50 <b>₽</b> per joint," he says.'
-	'You have <<joint>>.'
+	'"That''ll be 250 <b>₽</b> for enough weed to make five joints," he says.'
+	'You have enough weed for <<joint>> joints.'
 	act 'Leave the drug den': minut += 5 & gt 'street'
 	if money >= 1000:
-		act 'Buy 20 (1000 <b>₽</b>)':
+		act 'Buy enough weed for 20 joints (1,000 <b>₽</b>)':
 			money -= 1000
 			drugUser = 1
 			joint += 20
@@ -109,7 +97,7 @@ if $ARGS[0] = 'joints':
 		end
 	end
 	if money >= 500:
-		act 'Buy 10 (500 <b>₽</b>)':
+		act 'Buy enough weed for 10 joints  (500 <b>₽</b>)':
 			money -= 500
 			drugUser = 1
 			joint += 10
@@ -118,7 +106,7 @@ if $ARGS[0] = 'joints':
 		end
 	end
 	if money >= 250:
-		act 'Buy 5 (250 <b>₽</b>)':
+		act 'Buy enough weed for 5 joints  (250 <b>₽</b>)':
 			money -= 250
 			drugUser = 1
 			joint += 5
@@ -126,17 +114,49 @@ if $ARGS[0] = 'joints':
 			gt 'narkopriton', 'joints'
 		end
 	end
-	if money >= 50:
-		act 'Buy 1 (50 <b>₽</b>)':
-			money -= 50
+	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
+	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
+	act 'Buy some cocaine instead': gt 'narkopriton', 'cocaine'
+end
+
+if $ARGS[0] = 'cocaine':
+	*clr & cla
+	gs 'stat'
+	'<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.'
+	act 'Leave the drug den': minut += 5 & gt 'street'
+	if money >= 7200:
+		act 'Buy enough cocaine for 20 lines (7,200 <b>₽</b>)':
+			money -= 7200
+			drugUser = 1
+			dur += 20
+			minut += 5
+			gt 'narkopriton', 'cocaine'
+		end
+	end
+	if money >= 3600:
+		act 'Buy enough cocaine for 10 highs (3,600 <b>₽</b>)':
+			money -= 3600
 			drugUser = 1
-			joint += 1
+			dur += 10
 			minut += 5
-			gt 'narkopriton', 'joints'
+			gt 'narkopriton', 'cocaine'
+		end
+	end
+	if money >= 1800:
+		act 'Buy enough cocaine for 5 highs (1,800 <b>₽</b>)':
+			money -= 1800
+			drugUser = 1
+			dur += 5
+			minut += 5
+			gt 'narkopriton', 'cocaine'
 		end
 	end
 	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
 	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
+	act 'Buy some weed instead': gt 'narkopriton', 'joints'
 end
 
 if $ARGS[0] = 'heroin':
@@ -144,11 +164,11 @@ if $ARGS[0] = 'heroin':
 	gs 'stat'
 	'<center><b>Local drug den</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
-	'"That''ll be 1000 <b>₽</b>," he says.'
+	'"That''ll be 300 <b>₽</b>," he says.'
 	act 'Leave the drug den': minut += 5 & gt 'street'
-	if money >= 1000:
-		act 'Buy some heroin and use it (1,000 <b>₽</b>)':
-			money -= 1000
+	if money >= 420:
+		act 'Buy and use heroin (420 <b>₽</b>)':
+			money -= 420
 			if SNarkTimes = 0:
 				*clr & cla
 				minut += 10
@@ -158,6 +178,14 @@ if $ARGS[0] = 'heroin':
 				'It''s obvious that you have no idea what to do. He takes pitty on you and cooks you up a shot. He loads the needle full and gives it to you.'
 				'"Thanks." You take the needle and go find a couch in the house to sit on.'
 				'Finding a couch, you sit down and look at the needle apprehensively, you question yourself...'
+				act 'You can''t help but think of all the horror stories and return the drugs':
+					*clr & cla
+					'<center><b>Local drug den</b></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
+					'You change your mind and give the syringe back to the guy.'
+					'"I don''t do refunds girl," he said.'
+					act '"I know," you say and leave': minut += 5 & gt 'street'
+				end
 				act 'You remember the look of bliss on the junkies faces in the park and use the drugs':
 					*clr & cla
 					minut += 5
@@ -170,14 +198,6 @@ if $ARGS[0] = 'heroin':
 					gs 'stat'
 					act 'You lay there briefly rolling, before leaving': gs 'events', 'snkayf1'
 				end
-				act 'You can''t help but think of all the horror stories and return the drugs':
-					*clr & cla
-					'<center><b>Local drug den</b></center>'
-					'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
-					'You change your mind and give the syringe back to the guy.'
-					'"I don''t do refunds girl," he said.'
-					act '"I know," you say and leave': minut += 5 & gt 'street'
-				end
 			elseif SNarkTimes >= 1:
 				*clr & cla
 				minut += 5
@@ -191,11 +211,12 @@ if $ARGS[0] = 'heroin':
 				act 'Leave the drug den': minut += 5 & gt 'street'
 			end
 		end
-	elseif money < 1000 and SLomka > 0:
+	elseif money < 500 and SLomka > 0:
 		act 'Beg him to give you some':	gs 'narkopriton', 'drugslut'
 	end
 	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
-	act 'Buy some joints instead': gt 'narkopriton', 'joints'
+	act 'Buy some weed instead': gt 'narkopriton', 'joints'
+	act 'Buy some cocaine instead': gt 'narkopriton', 'cocaine'
 end
 
 if $ARGS[0] = 'drugslut':

locations/park.qsrc

@@ -93,6 +93,8 @@ if $ARGS[0] = 'start':
 	end
 
 	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, $metka
 
 	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.'

locations/parks.qsrc

@@ -47,6 +47,8 @@ if $ARGS[0] = 'start':
 	end
 
 	act 'Sit down on the bench':gs 'placer_sex', 'sitting_park_bench'
+	
+	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $metka
 
 	if pcs_inhib >= 35 or exhibitionist_lvl > 0:
 		act 'Flash your tits':

locations/pavaptcourtev.qsrc

@@ -35,7 +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'
+	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gt 'pavaptcourtev', 'smoke_joint'
 end
 
 if $ARGS[0] = 'wait':

locations/pod_ezd.qsrc

@@ -277,6 +277,7 @@ if $ARGS[0] = 'roof':
 			gt 'pod_ezd','etaj_5'
 		end
 	end
+	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $metka
 	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5

locations/saunawhore.qsrc

@@ -845,33 +845,30 @@ if $ARGS[0] = 'saunawork':
 
 	if workDolg > 0 and (pcs_mood <= 10 or SLomka > 0):
 		cls
-		workDolg += 1000
+		workDolg += 420
 		gs 'stat'
 		'You are beckoned by the nurse. "Hey, come here."'
 		'You go up to her and she demands your bared arm. You present your arm as required 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':
-			StrongNarkota += 25
-			SNarkTimes += 1
+			gs 'drugs', 'heroin'
 			minut += 10
 			gs 'stat'
 			gt 'saunawhore', 'saunawork'
 		end
 		exit
 	end
-	if workDolg <= 0 and pcs_mood <= 50 and SaunaWhore > 0 and money >= 1000:
-		act 'Ask for some drugs (1000 <b>₽</b>)':
+	if workDolg <= 0 and pcs_mood <= 50 and SaunaWhore > 0 and money >= 420:
+		act 'Ask for some drugs (420 <b>₽</b>)':
 			cls
 			gs 'stat'
 			'You are beckoned by the nurse. "OK, come here."'
 			'You go up to her and she asks for your bared 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':
-				StrongNarkota += 25
-				SNarkTimes += 1
+				gs 'drugs', 'heroin'
 				minut += 10
-				money -= 1000
-				gs 'stat'
+				money -= 420
 				gt 'saunawhore', 'saunawork'
 			end
 			exit