فهرست منبع

new school - fix the timing

rachels 6 سال پیش
والد
کامیت
e0d7d205f8

+ 11 - 11
locations/FedorEv

@@ -135,7 +135,7 @@ if $ARGS[0] = 'Gorslut':
 
 			act 'Move away':
 				if $loc = 'gschool_lunch':
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				else
 					gt 'gschool_grounds', 'main'
 				end
@@ -152,7 +152,7 @@ if $ARGS[0] = 'Gorslut':
 			
 			act 'Move away':
 				if $loc = 'gschool_lunch':
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				else
 					gt 'gschool_grounds', 'main'
 				end
@@ -169,7 +169,7 @@ if $ARGS[0] = 'Gorslut':
 
 		act 'Move away':
 			if $loc = 'gschool_lunch':
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			else
 				gt 'gschool_grounds', 'main'
 			end
@@ -187,7 +187,7 @@ if $ARGS[0] = 'Gorslut 2':
 
 	act 'Move away':
 		if $loc = 'gschool_lunch':
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		else
 			gt 'gschool_grounds', 'main'
 		end
@@ -319,7 +319,7 @@ if $ARGS[0] = 'Skate Date':
    gs 'stat'
    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/hold.jpg"></center>'
    'You place your arm around Fedor''s neck while enjoying his embrace and after a few moments he says, to you "It''s a bit chilly today. Would you like to go ice skating?"'
-      
+	  
 	act 'I would love too':
 		cls		
 		fedorkozqw = 4
@@ -417,8 +417,8 @@ if $ARGS[0] = 'Fedor Date 3':
 end	
 
 if $ARGS[0] = 'Park 2':
-    cls
-    gs 'stat'
+	cls
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/walk1.jpg"></center>'
 	'Fedor smiles as he said "Great, lets get going" he then takes your hand and walks you to the park'
 	
@@ -426,8 +426,8 @@ if $ARGS[0] = 'Park 2':
 end	
 
 if $ARGS[0] = 'Cinema 2':
-    cls
-    gs 'stat'
+	cls
+	gs 'stat'
 	if fedorKozlovQW = -15:
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/incognito.jpg"></center>'
@@ -441,8 +441,8 @@ if $ARGS[0] = 'Cinema 2':
 end
 
 if $ARGS[0] = 'Home 2':
-    cls
-    gs 'stat'
+	cls
+	gs 'stat'
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/hold.jpg"></center>'
 		'"I would like to spend some alone time with you. How about we head down to your place and watch some moivies?" Fedor smiles as he replies, "Sure thing, I always love spending time with you <<$pcs_firstname>>." you wrap your arms around his neck then walk with Fedor to his house.'

+ 1 - 1
locations/FedorEv2

@@ -697,7 +697,7 @@ if $ARGS[0] = 'Cafe':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/park/vkwip.jpg"></center>'
 	'Fedor walks you to the cafe in the finacial district then orders you some food and as you both sit down and chat, the food arrives and "Hey <<$pcs_nickname>> wanna get something to eat before we leave?"'
 	
-	act 'Go to class':gt 'gschool_lessons', 'afternoon'
+	act 'Go to class':gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] =  'Park 2':

+ 17 - 17
locations/FedorMisc

@@ -91,7 +91,7 @@ if $ARGS[0] =  'Fedor Chat':
 		end
 		
 		if $loc ! 'gdkin':
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		else
 			act 'Move away': gt $loc, $metka
 		end
@@ -104,7 +104,7 @@ if $ARGS[0] =  'Fedor Chat':
 	if (fedorKozlovQW > 1 or fedorKozlovQW < -10) and NikoPayback = 2 and FyodorVsNiko = 0 and FedorVsNiko = 0:act 'Ask for help with Niko':gt 'NikoPayback', 'Fedor Help'
 
 	if $loc ! 'gdkin':
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away': gt $loc, $metka
 	end
@@ -129,7 +129,7 @@ if $ARGS[0] =  'Fedor Chat 2':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/hall/fedor.jpg"></center>'
 		'You apologise and make your way back to school'
 
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -142,7 +142,7 @@ if $ARGS[0] =  'Fedor Hate':
 	'Fedor looks at you with hatred as he says, "I have nothing to say to you. Go away!"'	
 	
 	if $loc ! 'gdkin':
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away': gt $loc, $metka
 	end
@@ -232,7 +232,7 @@ if $ARGS[0] =  'Locker Room 1':
 
 				act 'Visit the restroom':gt 'FedorMisc', 'Restroom'
 
-				act 'Go to class':gt 'gschool_lessons', 'afternoon'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
 			if FedorLoveTalk = 1:
 				act 'Inside me':	
@@ -251,7 +251,7 @@ if $ARGS[0] =  'Locker Room 1':
 
 					act 'Visit the restroom':gt 'FedorMisc', 'Restroom'
 
-					act 'Go to class':gt 'gschool_lessons', 'afternoon'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end	
 			end				
 		end	
@@ -301,7 +301,7 @@ if $ARGS[0] =  'Locker Room 2':
 
 				act 'Visit the restroom':gt 'FedorMisc', 'Restroom'
 
-				act 'Go to class':gt 'gschool_lessons', 'afternoon'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
 			if FedorLoveTalk = 1:
 				act 'Inside me':	
@@ -320,7 +320,7 @@ if $ARGS[0] =  'Locker Room 2':
 
 					act 'Visit the restroom':gt 'FedorMisc', 'Restroom'
 
-					act 'Go to class':gt 'gschool_lessons', 'afternoon'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end	
 			end	
 		end	
@@ -373,7 +373,7 @@ if $ARGS[0] =  'Locker Room 3':
 
 				act 'Visit the restroom':gt 'FedorMisc', 'Restroom'
 
-				act 'Go to class':gt 'gschool_lessons', 'afternoon'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
 			if FedorLoveTalk = 1:
 				act 'Inside me':	
@@ -393,7 +393,7 @@ if $ARGS[0] =  'Locker Room 3':
 
 					act 'Visit the restroom':gt 'FedorMisc', 'Restroom'
 
-					act 'Go to class':gt 'gschool_lessons', 'afternoon'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end	
 			end	
 		end	
@@ -451,7 +451,7 @@ if $ARGS[0] =  'Hall':
 					
 					act 'Visit the restroom':gt 'FedorMisc', 'Restroom'
 					
-					act 'Go to class':gt 'gschool_lessons', 'afternoon'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 				if FedorLoveTalk = 1:
 					act 'Inside me':	
@@ -471,7 +471,7 @@ if $ARGS[0] =  'Hall':
 						
 						act 'Visit the restroom':gt 'FedorMisc', 'Restroom'
 						
-						act 'Go to class':gt 'gschool_lessons', 'afternoon'
+						act 'Go to class':gt 'gschool_lessons', 'short_break'
 					end
 				end	
 			end	
@@ -492,7 +492,7 @@ if $ARGS[0] =  'Restroom':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/restroom/girlsrestroom.jpg"></center>'
 	'The girls restroom is fairly clean and has 6 <a href="exec:gt ''fedormisc'', ''Quick Wash''">sinks</a>, 6 <a href="exec:gt ''mirror'', ''start''">mirrors</a> and 5 stalls arranged symetrically.'
 
-	act 'Leave restrrom':gt 'gschool_lessons', 'afternoon'		
+	act 'Leave restrrom':gt 'gschool_lessons', 'short_break'		
 end
 
 if $ARGS[0] =  'Quick Wash':
@@ -512,7 +512,7 @@ if $ARGS[0] =  'Quick Wash':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/facecleanse.jpg"></center>'
 	'You grab a few paper towels then approach the sink to clean yourself as thoroughly as possible while taking a few seconds to enjoy a splash of warm water on your face, leaving you feeling refreshed as you finish up then walk out of the restroom.'
 	
-	act 'Dry off':gt 'gschool_lessons', 'afternoon'
+	act 'Dry off':gt 'gschool_lessons', 'short_break'
 end	
 
 if $ARGS[0] =  'Smoke':
@@ -530,7 +530,7 @@ if $ARGS[0] =  'Smoke':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/hall/smoke.jpg"></center>'
 	'"I was just thinking the same thing." Fedor hands you a cigarette then puts one in his mouth as he collects his lighter from his pocket then lights both cigarettes. You both spend the rest of the lunch period smoking while discussing current events.'
 
-	act 'Finish smoking':gt 'gschool_lessons', 'afternoon'
+	act 'Finish smoking':gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] =  'Smoke 2':
@@ -1120,7 +1120,7 @@ if $ARGS[0] =  'VKwip':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/lockerroom/lr.jpg"></center>'
 				''
 				
-				act 'Go to class':gt 'gschool_lessons', 'afternoon'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end	
 			if FedorLoveTalk = 1:
 				act 'Inside me':	
@@ -1130,7 +1130,7 @@ if $ARGS[0] =  'VKwip':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/school/lockerroom/lr.jpg"></center>'
 					''
 
-					act 'Go to class':gt 'gschool_lessons', 'afternoon'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end	

+ 6 - 6
locations/IvanEv

@@ -127,7 +127,7 @@ if $ARGS[0] = 'School Chat':
 			if pav_slut <= 50 and IvanShowerQW = 1:
 				gs 'nogorslut'
 
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			elseif IvanShowerQW = 11 and IvanShowerYes = 1:
 				if rand(0,4) = 0:
 					'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
@@ -137,20 +137,20 @@ if $ARGS[0] = 'School Chat':
 				else
 					act 'Tell Ivan you''re bored':gt 'gdksport', 'Ivan_bored'
 				end
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			elseif IvanShowerYes = 0 and IvanShowerQW = 11 and ShowerIvan < 3:
 				'When you''re about to head for your next class, Ivan suddenly stops you and asks: "<<$pcs_nickname>>, want to meet up with me in the showers after school?"'
 				act 'Agree':
 					IvanShowerYes = 1
 					cla
 					'You give him a cute wink and say: "Sounds like fun, I''ll see you there!"'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 				act 'Decline':
 					IvanShowerYes = 2
 					cla
 					'You give it some thought, but have to decline. You shake your head apologetically and say: "Sorry Ivan, I can''t make it today."'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			else
 				npc_rel['A3'] += rand(5,10)
@@ -163,7 +163,7 @@ if $ARGS[0] = 'School Chat':
 					'You chat with Ivan, sharing multiple stories as Ivan happily listens while sharing several new stories of his own.'
 				end
 
-				act 'Go to class':gt 'gschool_lessons', 'schedule'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
 
 				act 'Skip one of your classes':
 					*clr
@@ -187,7 +187,7 @@ if $ARGS[0] = 'School Chat':
 	end
 
 	if $loc ! 'gdkin':
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away': gt $loc, $metka
 	end

+ 8 - 8
locations/Katja_Tanga

@@ -45,7 +45,7 @@ if $ARGS[0] = 'secretroom':
 							'As her quivering body subsides and her panting breath gets under control. You pull the dildo out of her pussy and your tongue out of her ass, you lay back looking at her. She gives you a dreamy smile and reaches over to take the dildo out of your hand. She gets up and sits down between your legs. She lifts them up and then drags you closer continuing to lift your hips till your butt rest just under her breasts and your shoulders and head are the only parts of your body still touching the floor. "You`re so beautiful I want to eat you out" Katja whispers, moments later she starts licking your pussy before her tongue darts inside of your pussy. As your pussy becomes soaked at her attentions you reach up and grab her hair, moaning "Yes, faster, faster." You moan and whine wanting more, for several minutes she only uses her tongue. Then she pulls her face away and slides the dildo into your sopping wet pussy and beings fucking you furiously with the dildo. With her other hand she slips one of her fingers in your ass and begins to finger fuck your ass at the same time. You can''t take it and quickly orgasm, your pussy over flowing with your juices, you feel them running down your stomach as the intense orgasm rocks your body.'
 							''
 							'After your orgasm subsides, she pulls her finger and the dildo out of you. Then she extends the dildo down to your mouth, opening your mouth as she slides the wet dildo into your mouth, as happily sucks your own pussy juices off it. Katja watches you with hungry eyes and biting her lower lip as you finish cleaning the dildo with your mouth. "That was amazing, I bet all the boys will be walking to their classes with erections thinking about what we was doing." She says and you both laugh, before getting quickly get dressed, knowing if you don''t hurry you will be late to class.'
-							gs 'gschool_lessons','short break'
+							gt 'gschool_lessons', 'short_break'
 						end
 					end
 				end
@@ -69,7 +69,7 @@ if $ARGS[0] = 'secretroom':
 					'Katja gets up and pushes you down on all fours, then she lays down with her face between your legs under your pussy. She sucks on her fingers for a moment before lifting them up and sliding two of them into your pussy, she beings to finger fuck you, while her thumb works on your clit, she knows all the right spots. It feels amazing, it takes no time before you are moaning loudly, while your juices run down your inner thighs. Pulling her fingers out she lefts up her head and begins to lick your pussy, while her fingers still wet from your pussy slide into your asshole. First one finger and then two fingers, she eats your pussy as she finger fucks your ass. Unable to take it anymore as convulsions run throughout your body, you orgasm hard. Your legs shaking, you can barely keep yourself from collapsing on her.'
 					''
 					'Waiting until you recover from your orgasm, Katja looks at you biting her lip and says. "That was amazing, I bet all the boys will be walking to their classes with erections thinking about what we was doing in here." You both laugh as quickly get dress, knowing if you don''t hurry you will be late to class.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -124,7 +124,7 @@ if $ARGS[0] = 'school1':
 	cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga2.jpg"></center>'
 	'Katja only blushes in embarrassment, and covers her eyes, "You''re such a bad influence, <<$pcs_nickname>>. I always wear shorts, the boys in this school are all perverts."'
-	gs 'gschool_lessons','short break'
+	gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'school2':
@@ -135,7 +135,7 @@ if $ARGS[0] = 'school2':
 	n_tanga += rand(0,1)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga3_<<i>>.jpg"></center>'
 	'Katja looked around to make sure no one else is around, then furtively lifts up her skirt, showing her panties. "See, I am wearing panties."'
-	gs 'gschool_lessons','short break'
+	gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'school3':
@@ -155,7 +155,7 @@ if $ARGS[0] = 'school3':
 		else 
 			'Blushing Katja pulls away from your touch and buttons her shirt back up, looking around to see if anyone had seen you grabbing her tits. "<<$pcs_nickname>> Are you crazy? Anyone could have seen us and what would they say?". '
 		end
-		gs 'gschool_lessons','short break'	
+		gt 'gschool_lessons', 'short_break'	
 	end
 end
 
@@ -191,10 +191,10 @@ if $ARGS[0] = 'school4':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_5.jpg"></center>'
 					'Katja looks over her shoulder at you, biting her lower lip she looks around to make sure no one is around and with a mischievous smile. Pulls her panties down further letting them drop around her ankles. "To hell with panties then." She quickly gathers her panties off the floor and sticks them in her purse. Then she twirls in front of you, giving you a fantastic view of her pussy and bare ass.'
 					if KatjaSlut > 80 and n_tanga => 4: param = 1 & ! not come up with another way to switch to the next elseif 
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -208,7 +208,7 @@ if $ARGS[0] = 'school5':
 	Katja_tanga_end = 1 & ! Flag of the end of the Event-to start the mini `s Event
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga6_<<i>>.jpg"></center>'  
 	'Without any embarrassment Katja pulls up her skirt and shows you her pussy. "Like what you see?" She asks with a teasing smile.'
-	gs 'gschool_lessons','short break'
+	gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'dance':

+ 7 - 7
locations/NikoDates

@@ -1450,7 +1450,7 @@ if $ARGS[0] = 'Locker Room':
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/school/jocks.jpg"></center>'
 													end
 
-													act 'Hallway':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'afternoon'
+													act 'Hallway':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'short_break'
 												end
 
 												act 'Remain silent [<font color=#FF00FF>Lose Fedor</font>]':
@@ -1798,7 +1798,7 @@ if $ARGS[0] = 'Walk Of Shame':
 									gs 'arousal', 'end'
 									gs 'stat'
 
-									act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'schedule'
+									act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'short_break'
 								end
 							end
 
@@ -1820,7 +1820,7 @@ if $ARGS[0] = 'Walk Of Shame':
 									*nl
 									'After the kiss, Niko says, "You are such a incredible girl. I always feel so lucky to have you, now don''t forget to meet me after school. I will be waiting in the courtyard." You nod your head, as Niko turns around then walks out of the restroom. You quickly get dressed then follow him out.'
 
-									act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'schedule'
+									act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'short_break'
 								end
 
 								act 'Refuse <font color="red">Break up with Niko</font>':
@@ -1835,7 +1835,7 @@ if $ARGS[0] = 'Walk Of Shame':
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/ouch.jpg"></center>'
 									'You quickly push Niko away. "Fuck you! You are just lying to me like you always do! I''m not trusting you anymore! Stay away from me!" Niko gets noticable angry, "You ungrateful bitch! I have done so much for you, and spent, so much on you. You better fucking apologize!" You nod your head. "Sure, I''ll apologize." You take two steps forward then ram your knee into Niko''s balls then spit on him before grabbing your clothes, and walking out of the restroom.'
 
-									act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'schedule'
+									act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'short_break'
 								end
 							end
 						end
@@ -1875,7 +1875,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
 
-		act 'Go to class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 
 	act 'Push him away':
@@ -1896,7 +1896,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 			*nl
 			'After the kiss, Niko says, "You are such a incredible girl. I always feel so lucky to have you, now don''t forget to meet me after school. I will be waiting in the courtyard." You nod, as Niko turns around then walks away. You quickly get dressed then follow him to the hallway.'
 
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 
 		act 'Break up with Niko':
@@ -1910,7 +1910,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/ouch.jpg"></center>'
 			'You quickly push Niko away. "Fuck you! You are just lying to me like you always do! I''m not trusting you anymore! Stay away from me!" Niko gets noticeably angry, "You ungrateful bitch! I have done so much for you, and spent, so much on you. You better fucking apologize!" You nod your head. "Sure, I''ll apologize." You take two steps forward then ram your knee into Niko''s balls then spit on him before grabbing your clothes, and walking away.'
 
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	end
 end

+ 9 - 0
locations/NikoDreams

@@ -476,6 +476,15 @@ if $ARGS[0] =  'Classroom Dream':
 		end	
 	end
 end
+if $ARGS[0] = 'Puppeteer':
+	gt 'NikoDreams','Classroom Dream'
+end
+if $ARGS[0] = 'Night Out':
+	gt 'NikoDreams','Classroom Dream'
+end
+if $ARGS[0] = 'Toilet Time':
+	gt 'NikoDreams','Classroom Dream'
+end
 
 --- NikoDreams ---------------------------------
 

+ 12 - 12
locations/NikoEv

@@ -64,7 +64,7 @@ if $ARGS[0] = 'Lunch Intro':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You sit down next to Niko, and you both spend the next few minutes, getting to know each other.'
 			
-			act 'Go to class':gt 'gschool_lessons', 'afternoon'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end	
 	end
 	
@@ -78,7 +78,7 @@ if $ARGS[0] = 'Lunch Intro':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
 		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unphased, as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. "Why was he so calm? What is it with that guy?" Before shaking your head and walking away.'	
 		
-		act 'Leave':gt 'gschool_lessons', 'afternoon'
+		act 'Leave':gt 'gschool_lessons', 'short_break'
 	end	
 end
 
@@ -124,7 +124,7 @@ if $ARGS[0] = 'Lunch Chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You sit down next to Niko, and you both spend the next few minutes, getting to know each other.'
 			
-			act 'Go to class':gt 'gschool_lessons', 'afternoon'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end	
 	end	
 	
@@ -138,7 +138,7 @@ if $ARGS[0] = 'Lunch Chat':
 			'<center><img <<$set_imgh>> src="images/pc/fuckoff1.jpg"></center>'
 			'You extend your middle finger at Niko, as you walk past him. "Get lost loser." Niko turns his head as he responds. "Am I not worthy?" You continue to walk past him until you reach the hallway.'
 			
-			act 'Go to class':gt 'gschool_lessons', 'afternoon'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end	
 	end	
 	
@@ -191,7 +191,7 @@ if $ARGS[0] = 'Lunch Chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
 			'You reply, "I just want to talk. Is that alright?" Niko shrugs, as he replies, "Sounds fine with me, I have some spare time." You, and Niko spend the next few minutes, chatting about various topics.'
 
-			act 'Go to class':gt 'gschool_lessons', 'afternoon'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end	
 	end	
 	
@@ -229,11 +229,11 @@ if $ARGS[0] = 'Lunch Chat':
 				'You walk away without saying a word. thinking to yourself. "Something about that guy, really annoys me."'
 			end
 				
-			act 'Go to class':gt 'gschool_lessons', 'afternoon'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 		
 	elseif NikoPayback = 2 and NikoPayed = daystart:
-		act 'Walk away':gt 'gschool_lessons', 'afternoon'
+		act 'Walk away':gt 'gschool_lessons', 'short_break'
 	elseif NikoPayback = 0:
 		act 'Leave':
 			cls
@@ -242,10 +242,10 @@ if $ARGS[0] = 'Lunch Chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You tell Niko. "I would love to stay but I need to head to class early today." He responds "I understand <<$pcs_firstname>>. I guess I will have to wait longer for an audience with this princess." You can feel your face getting flush as you get up and walk out toward the hallway.'
 					
-			act 'Go to class':gt 'gschool_lessons', 'afternoon'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	elseif NikoPayback = 3:
-		act 'Walk away':gt 'gschool_lessons', 'afternoon'	
+		act 'Walk away':gt 'gschool_lessons', 'short_break'	
 	end
 end
 
@@ -272,7 +272,7 @@ if $ARGS[0] = 'Date Intro':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
 		'You give Niko a warm smile as you take the gift from him. "Thank you Niko, This necklace is so beautiful." Niko looks at you with such loving eyes. "I''m so glad you like them, how about I pick you up after school, and we can both head out together?" You reply, "I might be a bit late so just wait for me at the courtyard, okay?" Niko bows before you. "As you wish milady." He then backs away while keeping his head bowed until he turns the corner.'		
 
-		act 'Go to class':gt 'gschool_lessons', 'afternoon'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end	
 	
 	act 'Decline the gift':	
@@ -283,7 +283,7 @@ if $ARGS[0] = 'Date Intro':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/nodate.jpg"></center>'
 		'"I''m sorry Niko, but I''m not really looking for any kind of relationship right now." Niko gives you a warm smile, as he responds "Don''t worry about it milady, I will just wait for the time where you feel yourself ready, for such a venture." You giggle as you respond, "You''re so weird but thanks for understanding. I''ll see you later." You turn around and walk away.'
 
-		act 'Go to class':gt 'gschool_lessons', 'afternoon'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -673,7 +673,7 @@ if $ARGS[0] =  'Lunch Breakup':
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/ouch.jpg"></center>'
 	
-		act 'Walk away':gt 'gschool_lessons', 'afternoon'
+		act 'Walk away':gt 'gschool_lessons', 'short_break'
 	end	
 end		
 	

+ 4 - 4
locations/NikoPayback

@@ -531,7 +531,7 @@ if $ARGS[0] = 'Fedor Help':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console2.jpg"></center>'		
 		'You quickly look up to Fedor then give him a passionate kiss before saying, "Thank you Fyodor, I always feel so safe with you." Fedor wipes your tears as he responds, "You will always be safe with me, and I will make sure that gopnik punk finds out the hard way what happens when someone fucks with you." You then reply, "Thank you Fyodor." before hearing the school bell. Fedor says, "Well it''s time for class. Don''t forget that i will always keep you safe." You give Fedor a loving smile before walking toward your next class.'
 	
-		act 'Go to class':gt 'gschool_lessons', 'afternoon'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -576,7 +576,7 @@ if $ARGS[0] = 'Fedor Help 2':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console1.jpg"></center>'
 					'Fedor takes a few seconds to catch his breath before asking you, "Are you alright <<$pcs_firstname>>? You took quite a hit there." You quickly hug Fedor, as you reply, "I''m great, thanks to you two." Ivan replies, "It was nothing special. I just wont let punks like them, hurt my friends." Fedor wraps his arms around you then says, "This is the last time that punk will ever hurt you. You are safe." You return the hug then hear the class bell, signaling the beginning of class. Fedor takes your hand then leads you toward you next class. While Ivan stays behind to "Chat" with Niko and Lavrenti.'
 
-					act 'Return to the hallway':gt 'gschool_lessons', 'afternoon'
+					act 'Return to the hallway':gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end	
@@ -637,7 +637,7 @@ if $ARGS[0] = 'Ivan Help':
 		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/hug1.jpg"></center>'	
 	
-		act 'Return to the hallway':gt 'gschool_lessons', 'afternoon'
+		act 'Return to the hallway':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -695,7 +695,7 @@ if $ARGS[0] = 'Vitek Help':
 			*nl
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss3.mp4"></video></center>'
 
-			act 'Continue toward the hallway':gt 'gschool_lessons', 'afternoon'
+			act 'Continue toward the hallway':gt 'gschool_lessons', 'short_break'
 		end	
 	end
 end

+ 1 - 1
locations/Sgrup

@@ -12,7 +12,7 @@ if grupTipe[i] = 6:$textgrup += '
 if i < 57:jump 'markgruploop'
 
 '<<$textgrup>>'
-!!gs 'gschool_lessons','short break'
+!!gt 'gschool_lessons', 'short_break'
 
 --- Sgrup ---------------------------------
 

+ 1 - 1
locations/Sgrup1

@@ -12,7 +12,7 @@ if grupTipe[i] = 3:$textgrup += '
 if i < 47:jump 'markgruploop'
 
 '<<$textgrup>>'
-!!gs 'gschool_lessons','short break'
+!!gt 'gschool_lessons', 'short_break'
 
 --- Sgrup1 ---------------------------------
 

+ 1 - 1
locations/Sgrup2

@@ -12,7 +12,7 @@ if grupTipe[i] = 2:$textgrup += '
 if i < 47:jump 'markgruploop'
 
 '<<$textgrup>>'
-!!gs 'gschool_lessons','short break'
+!!gt 'gschool_lessons', 'short_break'
 
 --- Sgrup2 ---------------------------------
 

+ 1 - 1
locations/Sgrup3

@@ -12,7 +12,7 @@ if grupTipe[i] = 1:$textgrup += '
 if i < 47:jump 'markgruploop'
 
 '<<$textgrup>>'
-!!gs 'gschool_lessons','short break'
+!!gt 'gschool_lessons', 'short_break'
 
 --- Sgrup3 ---------------------------------
 

+ 1 - 1
locations/Sgrup4

@@ -12,7 +12,7 @@ if grupTipe[i] = 4:$textgrup += '
 if i < 61:jump 'markgruploop'
 
 '<<$textgrup>>'
-!!gs 'gschool_lessons','short break'
+!!gt 'gschool_lessons', 'short_break'
 
 --- Sgrup4 ---------------------------------
 

+ 1 - 1
locations/Sgrup5

@@ -14,6 +14,6 @@ if i < 47:jump'markgruploop'
 
 '<<$textgrup>>'
 
-!!gs 'gschool_lessons','short break'
+!!gt 'gschool_lessons', 'short_break'
 --- Sgrup5 ---------------------------------
 

+ 20 - 20
locations/Snpc

@@ -118,7 +118,7 @@ if numnpc = 45:
 					'You place your hand on her shoulders and gentle push her away. "No I don''t want to."'
 					'She rolls her eyes. "Fine what ever, if you don''t want to have a little fun, I will find someone that does." With that she turns and walks off, leaving you unsure what just happened.'
 
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 				act 'Go with it':
 					cls
@@ -161,7 +161,7 @@ if numnpc = 23:
 			'You thank her for the help. Maybe now you''ll finally be able to get out of this hell.'
 
 			if $loc ! 'gdkin':
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			else
 				act 'Move away': gt $loc, $metka
 			end
@@ -208,7 +208,7 @@ act 'Chat':
 		'Dimka does no efforts to hide his disdain for you: "Get away from me, you pimply pig."'
 
 		if $loc ! 'gdkin':
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		else
 			act 'Move away': gt $loc, $metka
 		end
@@ -220,7 +220,7 @@ act 'Chat':
 		gs 'nogorslut'
 		gs 'yesgorslut'
 
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	else
 		gs 'nogorslut'
 		gs 'yesgorslut'
@@ -236,7 +236,7 @@ if numnpc = 13 and lariskaHelp = -1:
 	'She looks at you rejectedly, and softly says: "Leave me alone, <<$pcs_nickname>>. I want nothing to do with you any more."'
 
 	if $loc ! 'gdkin':
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away': gt $loc, $metka
 	end
@@ -259,13 +259,13 @@ if numnpc = 2:
 
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-            '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
 
 			if pav_slut < 75:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
 			if pav_slut >= 75:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
 
 			if $loc ! 'gdkin':
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			else
 				act 'Move away': gt $loc, $metka
 			end
@@ -314,9 +314,9 @@ if numnpc = 12:
 
 			if pav_slut < 25:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			if pav_slut >= 25:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
-			if $loc ! 'gdkin':gs 'gschool_lessons','short break'
+			if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
 			if $loc ! 'gdkin':
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			else
 				act 'Move away': gt $loc, $metka
 			end
@@ -338,11 +338,11 @@ if numnpc = 14:
 			meynoldQW = 2
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-            '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
 			'You approach Katja and thank her for taking you home from the disco when you were drunk, the other night. Katja gives you a knowing smile and says: "Don''t mention it, <<$pcs_nickname>>! You really shouldn''t get that drunk at the disco though, that could end badly. Some of the guys there are real pigs..."'
 
 			if $loc ! 'gdkin':
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			else
 				act 'Move away': gt $loc, $metka
 			end
@@ -384,7 +384,7 @@ if numnpc = 14:
 
 				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes, and blushes.'
 				if $loc ! 'gdkin':
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				else
 					act 'Move away': gt $loc, $metka
 				end
@@ -397,7 +397,7 @@ if numnpc = 14:
 
 				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes, and blushes.'
 				if $loc ! 'gdkin':
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				else
 					act 'Move away': gt $loc, $metka
 				end
@@ -410,7 +410,7 @@ if numnpc = 14:
 
 				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 				if $loc ! 'gdkin':
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				else
 					act 'Move away': gt $loc, $metka
 				end
@@ -435,7 +435,7 @@ if numnpc = 14:
 			if Katjahorny < 30:
 				'She pulls away from you as you try and kiss her, she looks around to see if anyone seen. "Not here and not now."'
 				if $loc ! 'gdkin':
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				else
 					act 'Move away': gt $loc, $metka
 				end
@@ -463,7 +463,7 @@ if numnpc = 14:
 			'You tell her that the only way you have thought of to get rid of their blackmailing, is to get blackmailing material of your own. Katja nods and says: "That makes sense, actually... if you could somehow make it look violent, I bet it would work even better! I don''t know where you would be able to find a tiny camera though... maybe Albina can help you?"'
 
 			if $loc ! 'gdkin':
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			else
 				act 'Move away': gt $loc, $metka
 			end
@@ -505,7 +505,7 @@ if numnpc = 16:
 			if pav_slut < 25:'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			if pav_slut >= 25:'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
 			if $loc ! 'gdkin':
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			else
 				act 'Move away': gt $loc, $metka
 			end
@@ -539,7 +539,7 @@ if numnpc = 16:
 				'She starts using her fingers on you as well and is really getting into it, you start to pant and moan. Clamping a hand over your own mouth to keep yourself from crying out, it doesn''t her long to bring you to a climax.'
 				'Your whole body shudders as the orgasm rocks your body, you grind your pussy against her face as it does. Once the sensation has passed you look down and see Natasha smiling up at you, obviously pleased with herself. You lean down and give her a long slow passionate kiss, tasting your own pussy juices. A few moments later the bell rings and you both hurry to class.'
 				if $loc ! 'gdkin':
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				else
 					act 'Move away': gt $loc, $metka
 				end
@@ -565,7 +565,7 @@ if numnpc = 31:
 			gs 'gschool_gossip', 'girls'
 		end
 		if $loc ! 'gdkin':
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		else
 			act 'Move away': gt $loc, $metka
 		end
@@ -573,7 +573,7 @@ if numnpc = 31:
 end
 
 if $loc ! 'gdkin':
-	gs 'gschool_lessons','short break'
+	gt 'gschool_lessons', 'short_break'
 else
 	act 'Move away': gt $loc, $metka
 end

+ 6 - 6
locations/brosh

@@ -35,7 +35,7 @@ if evgentipe = 0:
 				gs 'arousal', 'end'
 				gs 'stat'
 			
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
@@ -73,7 +73,7 @@ elseif evgentipe = 1:
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
@@ -112,7 +112,7 @@ elseif evgentipe = 2:
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end
 		if brotherSex > 6:
@@ -136,7 +136,7 @@ elseif evgentipe = 2:
 
 				gs 'brother', 'brotherSexEnd'
 
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
@@ -171,14 +171,14 @@ elseif evgentipe = 3:
 			gs 'arousal', 'end'
 			gs 'stat'
 				
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	end
 
 	exit
 end
 
-!gs 'gschool_lessons','short break'
+!gt 'gschool_lessons', 'short_break'
 
 --- brosh ---------------------------------
 

+ 2 - 2
locations/cumreaction

@@ -7,7 +7,7 @@ if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
 	'<<$npc_firstname[$static_num]>> looks at you "What is that? Is that sperm? Fuck you nasty slut, you could at least clean yourself afterwards."'
 
 	if $loc = 'gschool_lunch':
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away':gt $loc, $metka
 	end
@@ -23,7 +23,7 @@ if cumloc[12] = 1 and rand(0,30) = 0:
 	'<<$npc_firstname[$static_num]>> looks at you, "What is that smell on your breath? Yuck It''s smells like sperm. Couldn''t you at least clean your mouth after sucking dicks."'
 
 	if $loc = 'gschool_lunch':
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	else
 		act 'Move away':gt $loc, $metka
 	end

+ 25 - 25
locations/dimaRevenge

@@ -160,7 +160,7 @@ if ARGS[0] = 3:
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
 					'Not knowing what else to do right now, you head to class.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			elseif grupTipe[0] = 4:
 				!!if gopnik!!
@@ -209,7 +209,7 @@ if ARGS[0] = 3:
 								'He falls to the ground, unconscious. Lena and Lera look at you with surprised looks on their faces. "Damn, <<$pcs_nickname>>! You knocked him out! How are you so strong?"'
 								'That felt good. Really good. Lena and Lera enjoyed it too. You can see in their faces that they have new respect for you. "Check his pockets," says Lena, "I''ll keep his watch."'
 								'You check his pockets and find 10000 roubles in his wallet. Fucking rich kid. This should teach him. "The teacher is coming," says Lera. "Let''s get out of here."'
-								gs 'gschool_lessons','short break'
+								gt 'gschool_lessons', 'short_break'
 							elseif pcs_stren < 80:
 								!!if strength lower than 80
 								grupvalue[4] += 5
@@ -227,7 +227,7 @@ if ARGS[0] = 3:
 									'"You better." You turn to leave, but Lena stops you.'
 									'"Check his pockets," she says, "I''ll keep watch."'
 									'You check his pockets and find 10000 roubles in his wallet. Fucking rich kid. This should teach him. "The teacher is coming," says Lera, "Let''s get out of here."'
-									gs 'gschool_lessons','short break'
+									gt 'gschool_lessons', 'short_break'
 								elseif win = 0:
 									!!If you lose!!
 									grupvalue[4] -= 2
@@ -235,7 +235,7 @@ if ARGS[0] = 3:
 									'"Where the hell did you learn how to fight, <<$pcs_nickname>>," Lera asks in an annoyed tone before sweeping Dimka''s legs out from under him. Lena and Lera proceed to kick and stomp Dimka until he starts begging for them to stop. 
 									After a few more hits, they get bored and check his pockets for cash. "10000 roubles! Nice." They split the money among themselves leaving none for you.'
 									'Lena turns to you and says tauntingly, "You either need to learn how to fight or get used to serving us, little bunny." Before you can say anything, the bell rings for class.'
-									gs 'gschool_lessons','short break'
+									gt 'gschool_lessons', 'short_break'
 								end
 							end
 						end
@@ -248,7 +248,7 @@ if ARGS[0] = 3:
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
 					'Not knowing what else to do right now, you head to class.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			elseif grupTipe[0] = 1:
 				!!if popular!!
@@ -273,7 +273,7 @@ if ARGS[0] = 3:
 						'You give her a skeptical look then ask her, "I know a few secrets about Dimka. Wanna hear?"'
 						'You proceed to tell her every awful thing about Dimka from how he treats girls to his drug habit. She listens attentively and you can tell she is eager to spread it around. 
 						When you are satisfied you head to class and let Lizaveta do the rest.'
-						gs 'gschool_lessons','short break'
+						gt 'gschool_lessons', 'short_break'
 					end
 				end
 				act 'Go to class':
@@ -283,7 +283,7 @@ if ARGS[0] = 3:
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
 					'Not knowing what else to do right now, you head to class.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			elseif grupTipe[0] = 2:
 				!!If jock!!
@@ -317,7 +317,7 @@ if ARGS[0] = 3:
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/cheekkiss.jpg"></center>'
 							'"Thanks, you two. I''m sure he will stop spreading rumors about me now." You give both of them a peck on the cheek. Erast blushes red. Ivan just grins. 
 							"It was our pleasure," Ivan says. "Dimka was due a beating anyway. If he starts talking shit again, give us a call." The three of you head to class.'
-							gs 'gschool_lessons','short break'
+							gt 'gschool_lessons', 'short_break'
 						end
 					end
 				end
@@ -328,7 +328,7 @@ if ARGS[0] = 3:
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
 					'Not knowing what else to do right now, you head to class.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			elseif grupTipe[0] = 5:
 				!!if outcast!!
@@ -388,7 +388,7 @@ if ARGS[0] = 3:
 								'You think long and hard. You really need that video, but going on a date with Petia just sounds awful, not to mention what others would say if they saw you together. Finally you come to a decision. 
 								"Okay, one date, but not here. I don''t want anyone at school to see us together. We''ll go to the city."'
 								'"It''s a date then," he says excitedly, "See you at the train station after school." With that, he leaves you alone. You sigh. Tomorrow is going to suck.'
-								gs 'gschool_lessons','short break'
+								gt 'gschool_lessons', 'short_break'
 							end
 						end
 					end
@@ -401,7 +401,7 @@ if ARGS[0] = 3:
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
 					'Not knowing what else to do right now, you head to class.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 			if otnBoyFrend['A2'] > 50:
@@ -417,7 +417,7 @@ if ARGS[0] = 3:
 					"It might be my fault," he says with a hint of guilt after listening to you. "Thinking about that video made me so mad so I erased his whole hardrive instead of just releasing a virus and corrupting the video."'
 					'You are upset to hear this, but you remember how understanding he was when you went to him for help before and can''t be too mad at him now. Before you can say anything, he says, "I''ll fix this, <<$pcs_nickname>>." 
 					He leaves and heads into the hallway. You hope he knows what he''s doing.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 				act 'Go to class':
 					*clr
@@ -427,7 +427,7 @@ if ARGS[0] = 3:
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
 					'Not knowing what else to do right now, you head to class.'
-					act 'Continue': gt 'gschool_lessons', 'schedule'
+					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -650,7 +650,7 @@ if dimaRevChoice = 5:
 				'"Hey, whats up? I''m sending you a video. Make sure you send it to everyone you kno-"'
 				'"Okay fine! You win. I''ll stop the rumors."'
 				'"That''s right, you will. I''ll make sure of it." Dimka leaves you alone and you breathe a sigh of relief. That was tense, but also exhilarating. You especially loved seeing the fear in his eyes. You take a minute to calm down, then head to class.'
-				act 'Continue': gt 'gschool_lessons', 'schedule'
+				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end
 
 			if $ARGS[1] = 'afterlunch':
@@ -729,7 +729,7 @@ if dimaRevChoice = 3:
 		'"I took her to a barbecue place in the city. The owner has a soft spot for me and gives me a discount. I think she has a thing for me."'
 		'"Yeah, I''m sure she does." Not wanting to waste anymore time, you lean closer and tell him, "Now about my problem. I need dirt on Dimka. Video would be best, but at this point I could use anything."'
 		'"Is this about the rumors he''s been spreading about you? I understand. I''ll get to work as soon as I get home. Meet me tomorrow in the hallway before class."'
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	end
 	if ARGS[0] = 5:
 		!!fifth day before class!!
@@ -780,7 +780,7 @@ if dimaRevChoice = 3:
 					'<center><img src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 					'The student chatter continues until a girl you don''t know walks through the hallway. All the girls go quiet and turn away from her while the boys make dirty comments behind her back while laughing among themselves. Instantly, it occurs to you: this is Dimka''s doing. 
 					You feel a combination of guilt and anger. So this is how he makes it right. By ruining some other poor girl''s life. You are angry at Dimka and want to punish him, but he did keep his promise, even if someone else was made to suffer. You force your feelings down and head to class, hoping the girl will be alright.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -797,7 +797,7 @@ if dimaRevChoice = 0:
 		'<center><b><font color="maroon">School Hallway</font></b></center>'
 		'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/behindherback.jpg"></center>'
 		'People are still talking about you. You do your best to ignore them. You haven''t seen Dimka since morning rollcall. You know he must be up to something.'
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	end
 	if ARGS[0] = 5:
 		!!fifth day after school.!!
@@ -942,7 +942,7 @@ if dimaRevChoice = 4:
 							He screams insult after insult at the two of you as you laugh your asses off. After a while in sounds less like swearing and more like rabid howling. Finally you get sick of his screaming and grab him by the hair, then slam his face into the ground. As he lays there unconscious, you check his pocket. 10000 roubles.'
 							'"Fucking rich kid," you say then you look at Lavrenti, "No offense."'
 							'"None taken," he replies. "We should get out of here, though."'
-							act 'Continue': gt 'gschool_lessons', 'schedule'
+							act 'Continue': gt 'gschool_lessons', 'short_break'
 						end
 					end
 				end
@@ -1081,7 +1081,7 @@ if dimaRevChoice = 2:
 			'As you enter the school you hear students talking excitedly. "I heard Lena is a huge slut, but she has to keep it a secret because Vitek beats up any guy who hits on her."'
 			'"I heard that too. I also heard that if you can catch her when she is all alone, she will happily go down on you." Someone is going to get their ass kicked. 
 			Who would be stupid enough to talk shit about Lena? Your first thought is Dimka, but what would he have to gain? You think about it as you head to class.'
-			act 'Continue': gt 'gschool_lessons', 'schedule'
+			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
 		if $ARGS[1] = 'lunch':
 			!!during lunch!!
@@ -1151,7 +1151,7 @@ if dimaRevChoice = 2:
 									'"Because I really wanted to fight someone," Ekaterina replies. "But I got stuck fighting this punching bag here." She points to Lazar who remains silent. Everyone is silent.'
 									'Then Vitek speaks up. "So Dimka tried to use me and my sister to do his dirty work. He is going to fucking get it tomorrow. As for you, Ivan, we''ll settle it in the ring next time." Ivan nods in response. Soon everyone is talking about what they''ll do to Dimka when they see him in school. 
 									After a few hours, they start letting people out.'
-									gs 'gschool_lessons','short break'
+									gt 'gschool_lessons', 'short_break'
 								end
 							end
 						end
@@ -1167,7 +1167,7 @@ if dimaRevChoice = 2:
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/bulliedinhall.jpg"></center>'
 			'You enter the school building and head to your locker. You listen to the other students for any new gossip. Predictably they are all talking about the fight yesterday. At least one good thing came out of that. You can see Dimka down the hall at his locker. Every jock and gopnik who passes him shoves him into the lockers as they pass. 
 			Dimka is in for a rough day.'
-			act 'Continue': gt 'gschool_lessons', 'schedule'
+			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
 		if $ARGS[1] = 'after':
 			dimaRevenge += 1
@@ -1205,7 +1205,7 @@ if dimaRevChoice = 1:
 			pav_sex +=60
 			'You enter the school and walk around listening to the other students. "I heard Dimka sucked some guy off for crack."'
 			'"I heard <<$pcs_firstname>> gets passed around by everyone in her apartment building." The rumors only get worse. You head to class.'
-			act 'Continue': gt 'gschool_lessons', 'schedule'
+			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
 		if $ARGS[1] = 'lunch':
 			!!during lunch break!!
@@ -1214,7 +1214,7 @@ if dimaRevChoice = 1:
 			'"Asshole," you reply. The two of you glare at each other for a while, before he leaves. You head over to Lizaveta. She stops you before you tell her anything.'
 			'"Are all these things you''ve been saying about Dimka true," she asks you.'
 			'You are surprised. She can''t really be this naive can she. "Of course, it''s true," you tell her with a straight face. "I wouldn''t lie to you." She seems to believe you and listens closely as you tell her more about Dimka.'
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	end
 
@@ -1230,7 +1230,7 @@ if dimaRevChoice = 1:
 			'She notes the look on your face. "If you guys want to destroy each other, it''s fine by me. I will happily help you do that, but I won''t be used, by either of you for you petty little games."'
 			'"I don''t need your help," you tell her angrily. "I''ll destroy Dimka myself. How hard is it to spread rumors, anyway?"'
 			'"You won''t do anything," she tells you. "Because I''ll tell everyone that you and Dimka are full of shit." She storms off. You head to class.'
-			act 'Continue': gt 'gschool_lessons', 'schedule'
+			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
 
 		if $ARGS[1] = 'lunch':
@@ -1256,7 +1256,7 @@ if dimaRevChoice = 1:
 				'"You can''t talk to me that way," Dimka says nervously, "My father would..."'
 				'"That''s enough," she cuts Dimka off, "Miss <<$pcs_lastname>>, go to class and tell your teacher that Mr. Nosov won''t be attending for the rest of the day." As you leave the office, you try and listen at the door. But it is thick and you can''t hear anything. 
 				You hear Mrs Sokoloff clear her throat as she catches you. She is the teacher manning the office at this time. After that you quickly go to class.'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end
 

+ 9 - 9
locations/gdksport

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 	CLOSE ALL
 	$metka = $ARGS[0]
 	$loc = $CURLOC
-    $location_type = 'public_indoors'
+	$location_type = 'public_indoors'
 	gs 'stat'
 	if night_mode = 1:
 		fcolor = rgb(255, 255, 255)
@@ -899,7 +899,7 @@ end
 
 if $ARGS[0] = 'shower':
 	cls
-    $location_type = 'bathroom'
+	$location_type = 'bathroom'
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1
@@ -1085,15 +1085,15 @@ if $ARGS[0] = 'Ivan_bored':
 	minut += 5
 	pcs_horny += 10
 	gs'stat'
-    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/school/ivan2.jpg"></center>'
-    'You look at Ivan for a long moment and bite your lower lip and then whisper just loud enough he can barely hear you. "I''m bored." He looks at you a moment then smiles, he looks around, then takes you by the hand and leads you away from the others, into one of the lesser used area''s of the school. He stops at one of the boys restrooms, going inside and leaving you outside. A few moments later two younger boys are ushered out by Ivan and sent packing. He watches them go, once they round the corner he pulls you into the bathroom.'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/school/ivan2.jpg"></center>'
+	'You look at Ivan for a long moment and bite your lower lip and then whisper just loud enough he can barely hear you. "I''m bored." He looks at you a moment then smiles, he looks around, then takes you by the hand and leads you away from the others, into one of the lesser used area''s of the school. He stops at one of the boys restrooms, going inside and leaving you outside. A few moments later two younger boys are ushered out by Ivan and sent packing. He watches them go, once they round the corner he pulls you into the bathroom.'
 
 	act 'Go into the bathroom with Ivan':
 		cls
 		pcs_horny += 20
-	    gs 'boyStat', 'A3'
+		gs 'boyStat', 'A3'
 		gs 'stat'
-	    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/sex/school/bbivanbj.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/sex/school/bbivanbj.jpg"></center>'
 		'Once inside Ivan starts to kiss you passionately while pulling your clothes off and tossing them all over, you return his kiss and help remove your clothes. He backs up pulling you along into one of the stalls with him. Once your clothes are removed he starts removing his own clothes, which you are only to happy to help with. Once you''re both fully naked, he sits down on the toilet and gently pushes you down to your knees.'
 		'He guides your head to his <<dick>>cm <<$dick_girth>> cock, using one your hands you grab his dick and start to stroke the shaft while you open your mouth and take his dick into your mouth. You wrap your lips tightly around his shaft and start sucking him, while using your tongue to tease the head. You alternate your hand from stroking him and fondling his balls.'
 		'He moans and grabs your hair, you can feel he is restraining himself from forcing your head down and jamming his dick down your throat. After a couple of minutes, he growls a bit and stands up, pulling you up as well. With out explaining he turns you around so quickly you almost stumble, only his strong hands on you keep you from falling into the stall wall. He roughly bends you over, using one hand to guide his cock the other grabs your butt cheek to spread it open.'
@@ -1120,7 +1120,7 @@ if $ARGS[0] = 'Ivan_bored':
 			end
 			
 			gs 'stat'
-		    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/sex/school/schoolanal.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/sex/school/schoolanal.jpg"></center>'
 			'He rubs the tip of his dick against your asshole for a couple of moments and then you feel a sharp pain as he pushes it in. With only your saliva as lubrication, it doesn''t slide in as easily. You bite your lip and cry out a little in pain. He relaxes a little and rubs your back as he takes it slow, giving you time to stretch and adjust to his cock invading your ass.'
 			'He slowly strokes his <<dick>>cm <<$dick_girth>> cock in your ass, with each stroke pushing it just a little deeper in your ass. Once he is about half way in your moans turn from pain to pleasure, while one of your hands starts rubbing your clit. You start moaning louder and panting, your pussy is now soaking wet. After a couple of minutes the pleasure is building up inside of your body so much you no longer even need to stimulate your clitorous any longer. "Fuck <<$pcs_nickname>>, you not only have the hottest ass of any girls in school, but the tightest one I have ever fucked." Ivan says as he can tell your getting into it, grabbing your hips with both hands. He drives himself balls deep into your ass, eliciting a squeak of pain from you, but sensation of pain is quickly overwhelmed by pleasure.'
 			'Holding onto your hips with both hands, he holds you steady and keeps you from pulling away, as he jack hammers his <<dick>>cm <<$dick_girth>> cock balls deep in your ass. You moan in pain and pleasure, mostly pleasure, the sounds of your moans, almost drowned out the sounds of his skin slapping against yours, his balls slapping against your wet pussy. You place your hands against the stall wall to keep him from driving your head into it, from his powerful and violent thrusts. As he abuses your poor little asshole, you find yourself loving every second of it.'
@@ -1132,13 +1132,13 @@ if $ARGS[0] = 'Ivan_bored':
 			gs 'arousal', 'anal', 5, 'sub', 'rough'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		
 		end
 	
 	end
 
-	gs 'gschool_lessons','short break'
+	gt 'gschool_lessons', 'short_break'
 
 end
 

+ 14 - 14
locations/gschool_boys_bathroom

@@ -63,7 +63,7 @@ if $ARGS[0] = 'bathroom2':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone2.jpg"></center>'
 		'For the rest of the period, you play on your phone and find it very relaxing. By the time the next class bell rings, you are in a far better mood.'
 
-		act 'Go to class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	else
 		pcs_willpwr += rand(5, 10)
 		pcs_mood += rand(10, 30)
@@ -73,7 +73,7 @@ if $ARGS[0] = 'bathroom2':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke2.jpg"></center>'
 		'For the rest of the period, you play on your phone while having another cigarette or two. You find it very relaxing and by the time the next class bell rings, you are in a far better mood.'
 
-		act 'Go to class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -124,7 +124,7 @@ if $ARGS[0] = 'boy1':
 	'After a couple of minutes, you hear someone else in the bathroom with you. You peek out and see <<$rand_boy>>. Smiling, you exit the stall and call his name. He whirls around, visibly startled, but then breaks into a smile when he sees you. "You scared the hell out of me!"' 
 	*nl
 	'Within moments, the two of you are chatting away about school, movies, sports, music and anything else that strikes your fancy. Before you know it, the class bell rings. You both stop, laugh and gather your things. You then bid each other later and head to your next class.'
-	act 'Go to class':gt 'gschool_lessons', 'schedule'
+	act 'Go to class':gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'boy2':
@@ -159,7 +159,7 @@ if $ARGS[0] = 'boy2':
 			*nl
 			'He backs up a step, his expression furious once more, and shoves you towards the door. "Fine, then get the fuck out of here. Fucking cock tease."'
 			'Glad he at least backed off, you gather your stuff and leave in a hurry before he can change his mind. You spend the rest of the class period hiding in the stairwells, trying to keep from getting spotted. Maybe skipping class isn''t such a good idea after all, but then again, this probably could have gone worse. Much worse.'
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 		act 'I said no':
 			cla
@@ -243,7 +243,7 @@ if $ARGS[0] = 'boy2_sub':
 				*nl
 				'Luckily, nobody else enters the bathroom and by the time you got cleaned up and dressed, it isn''t long before the bell for the next class rings. You head out before it does, so no one catches you coming out of the boys restroom, and wonder if he was being serious.'
 				dynamic $showerdin
-				act 'Go to class':gt 'gschool_lessons', 'schedule'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
@@ -279,7 +279,7 @@ if $ARGS[0] = 'boy3':
 			'He sighs loudly - it''s clear that he hoped for more but other than that, he''s hiding his disappointment well. "Okay, alright, I get it. Sure, I could talk for a bit. I just really thought you was wanting more, is all", he gives a half-assed apology.'
 			*nl
 			'The two of you talk about his next big game school, his last few games, movies, music and anything else that strikes your fancy. Before you know it, the class bell rings. You both stop, look up reflexively and gather your things. You then bid each other later and head to your next class.' 
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	end
 	act 'Return the kiss':gt 'gschool_boys_bathroom', 'boy3_kiss'
@@ -342,7 +342,7 @@ if $ARGS[0] = 'boy3_kiss':
 					'Suddenly, Lazar asks: "Hey <<$pcs_nickname>>, did you do the math homework?" You are a bit taken off-guard by the unexpected question - it just doesn''t seem to fit in with everything that''s just happened - and it takes you a moment to reply. "Yeah, why?"'
 					*nl
 					'"Mind if I borrow it and fill in mine real quick? I was busy with practice and didn''t have time." First taking each of your holes and now your homework, too? The thought crosses your mind and makes you grin but you nod anyway - what''s a little homework cheating between friends after you just let him fuck you up the ass in the boys room? It sure as hell beat going to class, though, and the two of you spend the rest of the period talking while he copies your homework.'
-					act 'Go to class':gt 'gschool_lessons', 'schedule'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -370,7 +370,7 @@ if $ARGS[0] = 'boy4':
 		'"Oh, right. Sorry." You''re not sure if he blushed or not - his complexion makes it a little difficult to tell. A few moments later, he steps out of the stall with his pants back on. You can still clearly see the bulge in his pants but you choose to ignore it.'
 		*nl
 		'The two of you talk about Russia and its culture, about America, what he thinks about living here, about movies, music and anything else that strikes your fancy. Before you know it, the class bell rings. You both stop, laugh and gather your things. You then bid each other later and head to your next class.'
-		act 'Go to class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 	act 'Help him out':
 		gs 'boyStat', 'A146'
@@ -473,7 +473,7 @@ if $ARGS[0] = 'boy5':
 		'"Talk? Really?" They both audible sigh in disappointment. "You sure you don''t want to have some fun?", Fedor asks, but after seeing your expression at his insistence, Ivan thumps him lightly in the chest, whispers to him "Let it go, man", then smiles reassuringly at you and says: "Yeah, sure, <<$pcs_nickname>>, we can talk."'
 		*nl
 		'You give Ivan a grateful smile in return and engage the two boys in a conversation. Soon, the three of you are talking about their sparring, fights, and training, but also about recently released movies, your favorite music and anything else that strikes your fancy. Before you know it, the class bell rings. All of you stop and look up reflexively at the sound. You bid each other later, your eyes locking with Ivan''s for a moment and you two sharing another smile, and then head to your next class.' 
-		act 'Go to class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 	act '"Fun sounds like fun"':
 		*clr & cla
@@ -535,7 +535,7 @@ if $ARGS[0] = 'boy5':
 					'Shortly after this moment, Fedor tenses up and holds your head still, his dick buried deep in your mouth. He shoots his cum deep inside, most of it hitting the back of your throat and getting swallowed instantly, and pumps his manhood even deeper into your mouth a couple more times before pulling out and standing up to watching Ivan, still pounding your ass. Not that he has much time to enjoy it: Maybe a minute later, Ivan groans loudly and buries his dick balls deep inside your ass and you feel a warmth deep inside you as he starts cumming. He keeps going for a few more stroke but then pulls out of your ass, just as he stops shooting spurts of sperm in your ass. As his dick leaves your ass, which gapes a bit after his enthusiastic fuck, you feel some of the cum running out. Ivan stands up and smiles. "Fuck, that was great. You''re the best, <<$pcs_nickname>>."'
 					*nl
 					'Fedor is already washing up at the sink. "Yeah, you are one amazing bitch... uh... I mean that in a good way." You get up as well and go to the sink to get cleaned up as best you can. You look over to them as you use paper towels to wipe the sperm off and out of your ass and grin when you find them watching you. "You guys were right: That was fun." The guys laugh. You keep chatting while you get dressed and the three of you talk about a variety of things in the little bit of time you have left before the class bell rings.'
-					act 'Go to class':gt 'gschool_lessons', 'schedule'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -592,7 +592,7 @@ if $ARGS[0] = 'boy6_not':
 		cla
 		*nl
 		'Without another word, you walk out the door. You hear the guys grumbling and calling you names, but you don''t listen. They are pretty pissed right now. You manage to sneak through the school and into one of the girls bathrooms. The rest of the period passes with you trying not to think about how the gopniks may or may not treat you now. You''ll find out the next time you run into them.'
-		act 'Go to class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -726,7 +726,7 @@ if $ARGS[0] = 'boy6_sub':
 							gs 'stat'
 							'You stand up, wobbly, your tears doing nothing to wash off the semen. You go to the sink and clean yourself up as best you can, which is a lot more than you expected but not enough to <i>feel</i> clean. When you think you''ve done everything you can do here to remove the sperm and have cried yourself out enough to pull yourself back together, you gather your clothes and get dressed. The bell rings, just as you button up your shirt and remember the ripped-off button. You hurriedly search, find and pocket it, check yourself in the mirror to make sure there''s no obvious bruises or cum stains and that it isn''t too obvious you''ve been crying. Then, with one last, deep breath, you head to class.'
 
-							act 'Go to class':gt 'gschool_lessons', 'schedule'
+							act 'Go to class':gt 'gschool_lessons', 'short_break'
 						end
 					end
 				end
@@ -953,7 +953,7 @@ if $ARGS[0] = 'Join them':
 			'Just when he pulls his dick out of her mouth again and you''ve already half-opened yours to take his cock back into it, he grunts and and starts jerking himself rapidly. Only a few strokes later, spurts of hot cum land on both Anushka and you, covering your lips, face and even some splattering over your breasts. Once he''s finished cumming on both of you, he sticks his dick between Anushka''s lips and she enthusiastically cleans him up. "Fuck, that was great. You two are some fine grade-A sluts." When his dick is sufficiently cleaned, Anushka starts licking the sperm off your face and body, and you return the favor to her. Once you have both lapped it all up, she starts kissing you again, as deep as before, swapping his sperm back and forth between your mouths.'
 			*nl
 			'He lights up a cigarette as he watches the two of you and gives his mostly limp cock a few rubs. "Shit, if you two keep that up, I will need another round!", he laughs, and two of you smile as you continue making out. Finally, Anushka breaks the kiss and gets up, swallowing most of his sperm herself. You swallow the bit that is left in your mouth, then get up as well and, along with the others, start cleaning up and getting dressed. Just about the time you finish dressing, the bell rings. As Arkadi walks out without another word, Anushka grabs you roughly by the chin, as she says. "We''re going to have to do this again sometime bitch, that was just to much fun." Before you can even respond to her comment she french kisses you deeply. Then she walks out as well, shooting you a smoldering look over her shoulder while licking her lips. Her words and act leave you breathless; that girl is a maelstrom of lust and passion and it''s hard not to get caught in it. You remember the bell, hurry to straighten out your clothes and head to class, still feeling her lips on you.'
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -1009,7 +1009,7 @@ if $ARGS[0] = 'company4':
 		*nl
 		'You rub your sensitive little nub carefully, to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck Vice Principal Kuznetsov is giving Miss Orlov. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder. You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seats like you are having a seizure.'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
-		act 'Go to Class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
 

+ 13 - 13
locations/gschool_events

@@ -211,7 +211,7 @@ if $ARGS[0] = 'rand_gopnic':
 			exhibition_exp += 5
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/buttflash.mp4"></video></center>'
 			'You snort at him and then look at his friend before looking back at him, as you wiggle your middle finger at him. Flipping him off while pretending you are wiggling your finger for another reason. "If I needed something that small to satisfy my itch, I could just use this." His friends howl with laughter, while he fumes a little. Then you turn and walk away with a laugh, flashing them your butt as you do. Teasing them a bit on what they are missing out on.'
-			act 'Walk away':gt 'gschool_lessons', 'afternoon'
+			act 'Walk away':gt 'gschool_lessons', 'short_break'
 		end
 		act 'Sure why not':
 			*clr & cla
@@ -254,7 +254,7 @@ if $ARGS[0] = 'rand_gopnic':
 				gs 'arousal', 'bj', 20, 'group', 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end
 	else
@@ -281,7 +281,7 @@ if $ARGS[0] = 'rand_gopnic':
 				'As you try and pull away <<$jock>> comes over and pulls the gopnik off you and turns to him. "Leave her alone!"'
 				'The gopnik turns towards him and narrows his eyes. "Or what pussy?"'
 				'<<$jock>> Steps up close crowding him. "Or I will fucking kick your ass right here!" Then they start shoving each other, but before more can happen a teacher interupts. "What''s going on here, break it up all of you." With that you word a thank you to <<$jock>> and slip away.'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			elseif i < 50:
 				i += 1
 				jump 'rand_jock_loop'
@@ -295,7 +295,7 @@ if $ARGS[0] = 'rand_gopnic':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
 						'"I''ll scream and when the teachers arrive I will tell him you tried to rape me." He fumes and leans in real close. "You''ll regreat this slut, I promise." With that he relents and leaves with the others going with him, all giving you looks you would rather not think about.'
-						gs 'gschool_lessons','short break'
+						gt 'gschool_lessons', 'short_break'
 					end
 				end
 
@@ -340,7 +340,7 @@ if $ARGS[o] = 'toilet_bj':
 		gs 'arousal', 'bj', 20, 'group', 'sub'
 		gs 'arousal', 'end'
 		gs 'stat'
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -396,7 +396,7 @@ if $ARGS[0] = 'rand_scoolboy':
 			'"Please, I didn''t want to! They made me, I promise! I''m sorry!"'
 			'You stare him down for a few seconds, and you realize he''s not lying. You know <<$rand_boy>> already doesn''t have an easy time in school. You give the other guys a derogatory look as you let him off the hook, "Alright, I believe you. Just don''t do it again, okay?"'
 			'He thanks you and quickly takes his seat for the class, visibly relieved you didn''t report him.' 
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 			exit
 		else 
 			'Wait a minute... you don''t recognize any of these people! You must be in the wrong classroom!'
@@ -424,7 +424,7 @@ if $ARGS[0] = 'rand_scoolboy':
 						end
 					end
 				end
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		elseif npc_rel[$static_num] > 50:
 !!can we change this so both slap him playfully and lift your skirt are options if you have a relationship of 50+ with the boy?
@@ -434,7 +434,7 @@ if $ARGS[0] = 'rand_scoolboy':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy2.jpg"></center>'
 				'You think to yourself, "<<$rand_boy>> ain''t so bad... but still, I can''t just let him do this."'
 				'You give him a playful slap in the face. It''s not hard enough to really hurt him but enough to send a message. The other boys laugh loudly, this is the best entertainment they''ve had during the break in a long time.'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lift your skirt':
 				*clr & cla
@@ -442,10 +442,10 @@ if $ARGS[0] = 'rand_scoolboy':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
 				'You think to yourself, "<<$rand_boy>> is actually kind of cute..."'
 				'You pretend the other boys aren''t there and sweetly ask him, "Come on <<$rand_boy>>, you know you only have to ask do you want to see more?" as you slowly begin to lift your skirt. That made him the hero of your class, and all the boys look at your body, and then at him in admiration. Then you drop your skirt back down and wave him off, "Just kidding, you pervert! Not with all these other guys around, anyway." and you give him a cute wink as you sit down and get ready for your next class. When you look back, you can see his face is all flustered.'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		else
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	elseif npcsex[r] = 1:
 		'You notice the confident stares of <<$rand_boy>> it must''ve been him.'
@@ -460,7 +460,7 @@ if $ARGS[0] = 'rand_scoolboy':
 			act 'Tease him':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
 				'You can see him starting to get turned on and sure this is going to turn out good for him. Then you lean in real close and whisper in his ear, but loud enough for others to hear. "Because this is what I have for you." You start sliding your skirt slowly up your thighs, now all the boys are watching and just before it gets high enough to show anything you let it go and it drops back in place. "Which is nothing." You say with a giggle and laugh off, you hear one of the boys saying to his friend. "God so close. She is such a tease."'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 			act 'Drag him to the men''s room':
 				*clr & cla
@@ -526,7 +526,7 @@ if $ARGS[0] = 'rand_scoolboy':
 										'Realizing you have to get to class soon, you quickly scoot over and take his penis in your mouth. As you quickly lick him clean, you taste the mixture of his and your juices; it makes you feel kind of raunchy, and you wouldn''t mind having another go if it wasn''t for class starting any minute now. You quickly straighten your clothes and hand him his pants, and quickly check your hair before you both run to class.'
 										gs 'arousal', 'bj', 2
 										gs 'arousal', 'end'
-										gs 'gschool_lessons','short break'
+										gt 'gschool_lessons', 'short_break'
 									end
 								end
 							end
@@ -546,7 +546,7 @@ if $ARGS[0] = 'rand_scoolboy':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy8.jpg"></center>'
 				'You kick <<$rand_boy>> in the balls, sending him and all of his classmates the message that you will not put up with this behavior in school. You watch him writhe in pain on the floor for a second, before collecting your things and making your way to your next class.'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end

+ 12 - 12
locations/gschool_girls_bathroom

@@ -59,7 +59,7 @@ if $ARGS[0] = 'bathroom2':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone'+ rand(1,2) +'.jpg"></center>'
 		'For the rest of the period, you play on your phone. Despite several instances of boredom and indecision that left you wishing you could just go out, you find it very relaxing to be your own master and by the time the next class bell rings, you are in a far better mood than before.'
 
-		act 'Go to class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	
 	else
 		pcs_willpwr += rand(5, 10)
@@ -70,7 +70,7 @@ if $ARGS[0] = 'bathroom2':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke'+ rand(1,3) +'.jpg"></center>'
 		'You spend the rest of the period playing on your phone while you smoke. The games on your cellphone are kinda boring, and once or twice you hear somebody walking around out on the corridor, causing your heart to skip a beat when you realize they might smell the smoke, but despite all that, you found this use of the period very relaxing and by the time the next class bell rings, you are in a far better mood than before.'
 
-		act 'Go to class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	
 	end
 
@@ -94,7 +94,7 @@ if $ARGS[0] = 'girl1':
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
 	'After a couple of minutes, you hear the bathroom door open - someone else is in the bathroom with you! Carefully, you peek out, half-expecting to see a teacher... and see <<$girl>>. Relieved and smiling, you exit the stall and greet her. She turns around, slightly startled at first but then breaking into a smile when she see you. Within seconds, the two of you are chatting away about school, boys, clothes, makeup and anything else that strikes your fancy, having all but forgotten about the fact that you are sitting in the school bathroom. Before you know it, the class bell rings. You both stop and look up out of reflex, then bid each other later and head to your next class.'		
-	act 'Go to class':gt 'gschool_lessons', 'schedule'
+	act 'Go to class':gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'girl2':
@@ -122,7 +122,7 @@ if $ARGS[0] = 'girl2':
 		'She glances at you, and smiles - not seductively like before but in a way you''ve rarely seen her smile since her fall from grace: Genuine, glad, happy even. "Sure. Yeah, I think I''d like that."' 
 		'The two of you spend the next hour talking about a variety of things, like you used to before. She gives you more than a few tips about how to use makeup, and you help her finish her own, putting into practice what she taught you. You talk about school and what you wanna do after, about family, about life... about anything and everything, except one thing: Sex. For one short period, Sonia and you pretend that you''re both innocent school girls again.' 
 		'And before you know it, the bell rings. Sonia gives you lingering hug and a final, dazzling smile before both of you head to class.'
-		act 'Go to Class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 	act 'Return the kiss':
 		*clr
@@ -154,7 +154,7 @@ if $ARGS[0] = 'girl2':
 				'You relish the smell and taste of her as she comes down from her high, eyes locked with each other and smiling like idiots as you recover. When her convulsions have stopped, she pulls you up and passionately kisses you, then gently licks her own juices off your face. The final kisses she gives you are different: Lingering, tender, almost bashful. With a smile, she breaks away from you and announces that you better get dressed. As you do, she asks: "<<$pcs_nickname>>, do you think we are going to write a test in chemistry this week?"'
 				*nl
 				'The question leaves you dumbfounded - it takes you a moment or two to realize that everything you just experienced with her took place in a school toilet and that you now have to return to ''reality''. "Uh, I think he said there would be a quiz, yeah. Maybe we should have studied instead of having fun." You can''t help but giggle, and Sonia joins in. You spend the rest of the hour till the bell rings talking about mundane stuff and (sigh) going over some chemistry notes. Still, if this is how good it can be, maybe you should skip class more often.'
-				act 'Go to Class':gt 'gschool_lessons', 'schedule'
+				act 'Go to Class':gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
@@ -248,7 +248,7 @@ if $ARGS[0] = 'girl3':
 			*nl
 			'"Yeah, me too, but not that kind of fun... at least not this week," you meaningfully place your hand on your stomach and Lena nods in understanding while Lera licks her lips, obviously hoping for some more smooches to make up for other pleasures. Instead, you manage to steer them away from the topic entirely and the three of you are soon talking about school, the gopniks and a couple of other things. Before you know it, the class bell rings and the three of you head to your next class.'
 			'You feel like you''ve earned a little more of their respect today.'
-			act 'Go to Class':gt 'gschool_lessons', 'schedule'
+			act 'Go to Class':gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -319,7 +319,7 @@ if $ARGS[0] = 'toy bunny':
 						'Once you have them both clean, the two girls squat down next to you and force you to sit back on your heels. Lena leans in close, uncomfortably close, and suddenly grabs you by your throat, her voice a menacing whisper: "You''re a good little bitch - **our** little bitch. And as long as you keep your mouth shut about this, we won''t have to punish you. But if I hear about this though, we will find you, call every guy we know and let them fuck you senseless - hell, we could probably even make money with that. And once we were done with you, everyone would think that Sonia was just a tease next to you. You see what I''m getting at, bitch?" You meekly nod your head'
 						*nl
 						'"Good, don''t you forget it. Now, be a good little bitch and stay like that until we leave." With that, they both stand up and seemingly forget about your existence: They talk about a variety of things, smoke and put their clothes in order while you sit between them, naked, until the class bell rings. When they finally leave, you get up and frantically collect your clothes, just barely making it into one of the stalls before other girls come in. With your heart beating like crazy after this close call, you get dressed, take a minute to wipe the girl cum off your face, and then head to your next class. Maybe classes aren''t so bad after all...'
-						act 'Go to Class':gt 'gschool_lessons', 'schedule'
+						act 'Go to Class':gt 'gschool_lessons', 'short_break'
 					else
 						'With your face covered in Lera''s juices, you pant, struggling to catch your breath. The two girls get up, but Lena forces Lera to squat down next to her again and gives you an imperious look. "Come here and lick my cum off Lera''s face." You get up and do as you''re told, licking Lera''s face clean. Once you''re done, Lera stands up once more, and both girls spread their legs, their pussies level with your kneeling self.'
 						*nl
@@ -328,7 +328,7 @@ if $ARGS[0] = 'toy bunny':
 						'Once you have them both clean, the two girls squat down next to you and force you to sit back on your heels. Lena leans in close, uncomfortably close, and suddenly grabs you by your throat, her voice a menacing whisper: "You''re a good little bitch - **our** little bitch. And as long as you know your place, we will all get along great... won''t we?" You meekly nod your head.'
 						*nl
 						'"Good bunny. Now be a good little bitch and stay like that until I tell you otherwise." You want to nod yes but Lena blindsides you with a long, passionate kiss before they both stand up. For all intents an purposes, they forget about your existence, because they start talking about a variety of things, smoke and put their clothes in order. Just when you think that the bell''s gonna ring any minute now, Lena gives you a gracious smile. "You know, you''ve been a good little bunny today. Go ahead, get dressed." Not only do they help you gather your clothes from the four corners of the bathroom but they chat with you, treating you as an equal now. Lera even helps you clean your face. Once the bell rings, the three of you leave together and head to the next class.'
-						act 'Go to Class':gt 'gschool_lessons', 'schedule'
+						act 'Go to Class':gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -427,7 +427,7 @@ if $ARGS[0] = 'company1':
 		gs 'arousal', 'mast', 10
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
-		act 'Go to Class':gt 'gschool_lessons', 'schedule'
+		act 'Go to Class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -470,7 +470,7 @@ if $ARGS[0] = 'company2':
 		gs 'arousal', 'mast', 10
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
-		act 'Go to Class':gt 'gschool_lessons', 'schedule'
+		act 'Go to Class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -569,7 +569,7 @@ if $ARGS[0] = 'company4':
 		gs 'arousal', 'mast', 10
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
-		act 'Go to Class':gt 'gschool_lessons', 'schedule'
+		act 'Go to Class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -1211,7 +1211,7 @@ if $ARGS[0] = 'caught4':
 						'Once your bare ass is exposed your begins to spank it with her open hand. She uses the full force of her swings to deliver stinging slaps to your bare ass. She spanks you until your ass is cherry red, she seems to only stop when her hand starts to hurt to much from spanking you to continue. She finally lets go of you and steps away. "In addition you will report to my office after school. Now get your ass to class and I don''t want to catch you cutting class again, you understand?" You nod your head and wipe away the tears, you straighten up your clothes and go to class.'
 						'DEV NOTE: This is not available yet.'
 					end
-					act 'Go to class':gt 'gschool_lessons', 'schedule'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end

+ 0 - 15
locations/gschool_grounds

@@ -305,15 +305,6 @@ if $ARGS[0] = 'bulding':
 	$loc = 'gschool_grounds'
 	$metka = 'bulding'
 	$location_type = 'public_indoors'
-	if night_mode = 1:
-		fcolor = rgb(255, 255, 255)
-		bcolor = rgb(0, 0, 0)
-		lcolor = rgb(106, 90, 205)
-	else
-		fcolor = rgb(0, 0, 0)
-		bcolor = rgb(255, 255, 255)
-		lcolor = rgb(106, 90, 205)
-	end
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Inside School</font></b></center>'
@@ -364,12 +355,6 @@ if $ARGS[0] = 'bulding':
 	act 'Continue':
 		!one line late from 1.2.4, timerange check by illume
 		if hour = 9: late = 1
-		if hour = 7:
-			minut += 120 & gs 'stat'
-		elseif hour = 8:
-			minut += 60 & gs 'stat'
-		end
-		minut += 60 - minut
 		gs 'stat'
 		BeInSchool += 1
 		if RAND(0,1) = 0:

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 216 - 119
locations/gschool_lessons


+ 73 - 73
locations/gschool_lessonsev1

@@ -149,7 +149,7 @@ if $ARGS[0] = 'biology':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Dan, but you don''t dare now that the teacher is keeping an eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Dan':
 				*clr & cla
@@ -166,14 +166,14 @@ if $ARGS[0] = 'biology':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
 				'You squeak loudly as his fingers quickly pinch your sensitive nipple and your hand quickly flies to your breast to shield it from further attack. You hear your teacher. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, while Dan is snickering behind you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Enjoy':
 				cla
 				npc_rel['A10'] += 3
 				'You bite your lip to silence the moan that wants to escape as you feel your molester''s fingers give your nipple a quick pinch before retreating. It was a nice treat to keep class interesting.'
 				gs 'arousal', 'foreplay', 5, 'exhibitionism'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				act 'Come get some more':
 					cla
 					npc_rel['A10'] += 3
@@ -204,7 +204,7 @@ if $ARGS[0] = 'biology':
 							'You spend the rest of class with Dan''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
 							gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 						end
-						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -215,7 +215,7 @@ if $ARGS[0] = 'biology':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Dan, but you don''t dare now that the teacher is keeping an eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Dan':
 				*clr & cla
@@ -253,56 +253,56 @@ if $ARGS[0] = 'biology':
 				npc_rel['A17'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Irina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Julia':
 				*clr & cla
 				npc_rel['A12'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Julia. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Dan':
 				*clr & cla
 				npc_rel['A10'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Dan. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lavrenti':
 				*clr & cla
 				npc_rel['A155'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Lavrenti. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Artem':
 				*clr & cla
 				npc_rel['A2'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Artem. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Natasha':
 				*clr & cla
 				npc_rel['A16'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Natasha. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lazar':
 				*clr & cla
 				npc_rel['A149'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Lazar. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lesco':
 				*clr & cla
 				npc_rel['A7'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Lesco. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 13:
 			pcs_exhibition +=2
@@ -314,7 +314,7 @@ if $ARGS[0] = 'biology':
 			act 'Pull your shirt closed':
 				cla
 				'You quickly grasp both sides of your blouse and pull them tightly together. Lazar grins when he realizes he''s been caught, and he winks at you before turning back to face the blackboard.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'You ignore it':
 				cla
@@ -322,7 +322,7 @@ if $ARGS[0] = 'biology':
 				pcs_exhibition +=3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
 				'You ignore it, letting Lazar continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 14:
 			*clr & cla
@@ -334,9 +334,9 @@ if $ARGS[0] = 'biology':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok' + rand(1,8) + '.jpg"></center>'
 				'You''re curious about what your classmates behind you are talking about. You can''t make out much of what they''re saying, but you do hear:'
 				gs 'gschool_gossip', 'gossip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -379,7 +379,7 @@ if $ARGS[0] = 'science':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Andrey, but you don''t dare now that the teacher is keeping an eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Andrey':
 				*clr & cla
@@ -408,7 +408,7 @@ if $ARGS[0] = 'science':
 				npc_rel['A17'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Irina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Andrey and Stasya':
 				*clr & cla
@@ -416,35 +416,35 @@ if $ARGS[0] = 'science':
 				npc_rel['A139'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Andrey and his girlfriend Stasya. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Mefodiy':
 				*clr & cla
 				npc_rel['A148'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Mefodiy. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Gerasim':
 				*clr & cla
 				npc_rel['A153'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Gerasim. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Veronika':
 				*clr & cla
 				npc_rel['A141'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Veronika. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Fedor':
 				*clr & cla
 				npc_rel['A5'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Fedor. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 10:
 			pcs_exhibition +=2
@@ -456,7 +456,7 @@ if $ARGS[0] = 'science':
 			act 'Pull your shirt closed':
 				cla
 				'You quickly grasp both sides of your blouse and pull them tightly together. Andrey grins when he realizes he''s been caught, and he winks at you before turning back to face the blackboard. While Stasya, having finally noticed what her boyfriend is doing, gives you a dirty look.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'You ignore it':
 				cla
@@ -465,7 +465,7 @@ if $ARGS[0] = 'science':
 				pcs_exhibition +=3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
 				'You ignore it, letting Andrey continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys. Though by the look on Stasya''s face you are not earning her friendship.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 11:
 			*clr & cla
@@ -477,9 +477,9 @@ if $ARGS[0] = 'science':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok' + rand(1,8) + '.jpg"></center>'
 				'You''re curious about what your classmates behind you are talking about. You can''t make out much of what they''re saying, but you do hear:'
 				gs 'gschool_gossip', 'gossip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -520,7 +520,7 @@ if $ARGS[0] = 'computer':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Vasily, but you don''t dare now that the teacher is keeping an eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Vasily':
 				*clr & cla
@@ -537,14 +537,14 @@ if $ARGS[0] = 'computer':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
 				'You squeak loudly as his fingers quickly pinch your sensitive nipple and your hand quickly flies to your breast to shield it from further attack. You hear your teacher. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, while Vasily is snickering behind you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Enjoy':
 				cla
 				npc_rel['A11'] += 3
 				'You bite your lip to silence the moan that wants to escape as you feel your molester''s fingers give your nipple a quick pinch before retreating. It was a nice treat to keep class interesting.'
 				gs 'arousal', 'foreplay', 5, 'exhibitionism'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				act 'Come get some more':
 					cla
 					npc_rel['A11'] += 3
@@ -575,7 +575,7 @@ if $ARGS[0] = 'computer':
 							'You spend the rest of class with Vasily''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
 							gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 						end
-						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -586,7 +586,7 @@ if $ARGS[0] = 'computer':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Vasily, but you don''t dare now that the teacher is keeping an eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Vasily':
 				*clr & cla
@@ -633,56 +633,56 @@ if $ARGS[0] = 'computer':
 				npc_rel['A11'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Vasily. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Albina':
 				*clr & cla
 				npc_rel['A23'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Albina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lizaveta':
 				*clr & cla
 				npc_rel['A140'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Lizaveta. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Alyona':
 				*clr & cla
 				npc_rel['A143'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Alyona. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Artem':
 				*clr & cla
 				npc_rel['A2'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Artem. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Gerasim':
 				*clr & cla
 				npc_rel['A153'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Gerasim. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Zinaida':
 				*clr & cla
 				npc_rel['A142'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Zinaida. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Sonia':
 				*clr & cla
 				npc_rel['A25'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Sonia. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 15:
 			pcs_exhibition +=2
@@ -694,7 +694,7 @@ if $ARGS[0] = 'computer':
 			act 'Pull your shirt closed':
 				cla
 				'You quickly grasp both sides of your blouse and pull them tightly together. Artem''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'You ignore it':
 				cla
@@ -702,7 +702,7 @@ if $ARGS[0] = 'computer':
 				pcs_exhibition +=3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
 				'You ignore it, letting Artem continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 16:
 			*clr & cla
@@ -714,9 +714,9 @@ if $ARGS[0] = 'computer':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok' + rand(1,8) + '.jpg"></center>'
 				'You''re curious about what your classmates behind you are talking about. You can''t make out much of what they''re saying, but you do hear:'
 				gs 'gschool_gossip', 'gossip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 !!this one below is blocked if Sveta is a nerd
 		elseif scooltiperand = 17:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teachdis.jpg"></center>'
@@ -727,7 +727,7 @@ if $ARGS[0] = 'computer':
 				'Your teacher doesn''t appreciate you interrupting his show, and calls attention to you, "Miss <<$pcs_lastname>>, stop fidgeting in your chair like that. It''s distracting."'
 				'You quickly let go of your skirt. He can still see up your legs, but you don''t have the courage to do anything about it now. Your cheeks turn crimson red as you mumble an apology, "I''m sorry, Mr. Ivanov."'
 				'For the remainder of the class, he keeps shooting glances in your direction. He seems to be having a great time in class today, and you suspect that you''re the reason.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Call him out':
 				*clr & cla
@@ -750,7 +750,7 @@ if $ARGS[0] = 'computer':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spreadb.jpg"></center>'
 					'The thoughts of him checking you out so sneakily turn you on a great deal, and the fact that you know you should know better make it even hotter. Throughout the class you keep spreading your legs whenever he looks your way, and you can tell the looks of your bare pussy are causing him a great deal of arousal as well. Unable to control yourself you occasionally give yourself a quick rub over your exposed pussy lips, preferably when he looks at you. Towards the end of the class your pussy lips are soaked in your juices, and you absent-mindedly put your finger in your mouth for a taste. '
 				end
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Flip him off':
 				*clr & cla
@@ -808,7 +808,7 @@ if $ARGS[0] = 'russian':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Svyatoslav, but you don''t dare now that the teacher is keeping an eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Svyatoslav':
 				*clr & cla
@@ -825,14 +825,14 @@ if $ARGS[0] = 'russian':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
 				'You squeak loudly as his fingers quickly pinch your sensitive nipple and your hand quickly flies to your breast to shield it from further attack. You hear your teacher. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, while Svyatoslav is snickering behind you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Enjoy':
 				cla
 				npc_rel['A10'] += 3
 				'You bite your lip to silence the moan that wants to escape as you feel your molester''s fingers give your nipple a quick pinch before retreating. It was a nice treat to keep class interesting.'
 				gs 'arousal', 'foreplay', 5, 'exhibitionism'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				act 'Come get some more':
 					cla
 					npc_rel['A10'] += 3
@@ -863,7 +863,7 @@ if $ARGS[0] = 'russian':
 							'You spend the rest of class with Svyatoslav''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
 							gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 						end
-						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -874,7 +874,7 @@ if $ARGS[0] = 'russian':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Svyatoslav, but you don''t dare now that the teacher is keeping an eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Svyatoslav':
 				*clr & cla
@@ -919,56 +919,56 @@ if $ARGS[0] = 'russian':
 				npc_rel['A146'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Marcus. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Stasya':
 				*clr & cla
 				npc_rel['A139'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Stasya. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Alyona':
 				*clr & cla
 				npc_rel['A143'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Alyona. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Ekaterina':
 				*clr & cla
 				npc_rel['A145'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Ekaterina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Svyatoslav':
 				*clr & cla
 				npc_rel['A8'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Svyatoslav. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Paulina':
 				*clr & cla
 				npc_rel['A24'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Paulina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Sonia':
 				*clr & cla
 				npc_rel['A25'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Sonia. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lesco':
 				*clr & cla
 				npc_rel['A7'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'During class you sit next to Irina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from the teacher, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 16:
 			pcs_exhibition +=2
@@ -980,7 +980,7 @@ if $ARGS[0] = 'russian':
 			act 'Pull your shirt closed':
 				cla
 				'You quickly grasp both sides of your blouse and pull them tightly together. Marcus''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'You ignore it':
 				cla
@@ -988,7 +988,7 @@ if $ARGS[0] = 'russian':
 				pcs_exhibition +=3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
 				'You ignore it, letting Marcus continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 17:
 			*clr & cla
@@ -1000,14 +1000,14 @@ if $ARGS[0] = 'russian':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok' + rand(1,8) + '.jpg"></center>'
 				'You''re curious about what your classmates behind you are talking about. You can''t make out much of what they''re saying, but you do hear:'
 				gs 'gschool_gossip', 'gossip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 18:
 			'While your''re busy doing an assignment, you hear some whispering coming from behind you. Turning around to try and tell your classmates to keep it quiet, you see Pauline showing off a part of her bra to Svyatoslav.'
 			'He sits there in total amazement, closely looking at what Pauline is doing. Obviously enjoying catching his attention, she spreads her legs, showing off her panties while Svyatoslav starts rubbing at the crotch of his pants. They still haven''t noticed you.'
 			'You quietly clear your throat and they snap out of their little scene, looking back at you and smiling. <i>"They''re not even ashamed."</i> you think to yourself, <i>"The rumors about them must be true."</i> as you turn back and focus on your assignment.'
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 19:
 			*clr & cla
 			'For today''s lesson Mr. Yenotin decides to have the class to read out a passage from a old literature book out loud, one that even native Russian speakers sometimes finds difficult with the slightly different pronunciations. You and your classmates open the book and Mr. Yenotin tells Stasya to begin from the top of the page, she sighs and starts reading loudly. After a couple of pages Mr. Yenotin stops and thanks Stasya. He looks around for someone to take over spotting Marcus, "Why don''t we have our exchange student read some pages, you need the practice anyway."'
@@ -1023,7 +1023,7 @@ if $ARGS[0] = 'russian':
 				'Not wanting to partake in the bullying you decide to speak up, "Oh, shut up Alyona. It''s not like you''re any better. At least Marcus has got an excuse, what''s yours, drunk again?"'
 				'Alyona reacts as expected, she leaps from her desk and heads straight towards you, "What the fuck did you say to me bitch? You don''t know anything about me, you say something like that to me again and I will fuck you up bitch!"'
 				'Before she reaches you Mr. Yenotin steps in and deescalates the situation telling Alyona to return to her desk. The class sits there in silence for a moment before Mr. Yenotin tells Lesco to read instead. After a while you notice Marcus looking at you, thankfully nodding for your help.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act'Join in':
 				*clr & cla
@@ -1033,20 +1033,20 @@ if $ARGS[0] = 'russian':
 				'"What''s wrong Marcus? Cat got your tongue?" you teasingly say.'
 				'Marcus murmurs something in English. "W-W-What''s that, s-s-speak up." you answer and have the whole class laughing.'
 				'"Miss. <<$pcs_lastname>> that''s enough! No need to be rude to our guest." Mr. Yenotin lectures you. "You did great Marcus, don''t listen to them." Marcus nods and thanks Mr. Yenotin while giving you cold stare.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act'Do nothing':
 				*clr & cla
 				'Not wanting to partake in the bullying, but also not wanting to piss off Alyona or the gopniks, you don''t say anything. Mr. Yenotin says to Marcus "Please continue." Then gives Alyona a look. "Please be nice, treat others as you would like them to treat you." Which doesn''t have the effect he was hoping for as it just gets her and several other students laughing.'
 				'After a bit Marcus is still struggling and now Paulina joins in as well in taunting Marcus, by interrupting him each time he almost gets the word right. Soon about half the class has joined in and Mr. Yenotin gives up. "That''s enough Marcus, it was a good job. Now how about we have someone else read for a bit, Alyona why don''t you read the next part."'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act'Take over reading':
 				*clr & cla
 				npc_rel['A146'] += 3
 				grupvalue[3] += 5
 				'You hate Marcus is being bullied but you don''t want to piss off Alyona or the other gopniks either. So instead you wait for Marcus to stop again and you start reading instead. You know it isn''t your turn but you don''t care, Mr. Yenotin smiles at you and doesn''t seem to mind. Marcus lets out a sigh of relief and gives you a grateful smile, while Alyona just rolls her eyes at you for ruining her fun.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 20:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teachdis.jpg"></center>'
@@ -1057,7 +1057,7 @@ if $ARGS[0] = 'russian':
 				'Your teacher doesn''t appreciate you interrupting his show, and calls attention to you, "<<$pcs_nickname>>, stop fidgeting in your chair like that. It''s distracting."'
 				'You quickly let go of your skirt. He can still see up your legs, but you don''t have the courage to do anything about it now. Your cheeks turn crimson red as you mumble an apology, "I''m sorry, Mr. Yenotin."'
 				'For the remainder of the class, he keeps shooting glances in your direction. He seems to be having a great time in class today, and you suspect that you''re the reason.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Call him out':
 				*clr & cla
@@ -1065,7 +1065,7 @@ if $ARGS[0] = 'russian':
 				'He can''t be doing that! You pull your skirt over your legs so he can''t look at you any more and loudly say'
 				'"Mr. Yenotin, be careful! If you keep staring at me like that, your eyeballs might pop out of their sockets!"'
 				'A loud laughter erupts in the classroom, and your teacher looks embarrassed. He opens his mouth as if he wants to say something in defense, but thinks the better of it and just lets you have your win. After a while, he manages to get the class back under control and continues to teach, carefully avoiding your legs.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Spread your legs':
 				*clr & cla
@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'russian':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spreadb.jpg"></center>'
 					'The thoughts of him checking you out so sneakily turn you on a great deal, and the fact that you know you should know better make it even hotter. Throughout the class you keep spreading your legs whenever he looks your way, and you can tell the looks of your bare pussy are causing him a great deal of arousal as well. Unable to control yourself you occasionally give yourself a quick rub over your exposed pussy lips, preferably when he looks at you. Towards the end of the class your pussy lips are soaked in your juices, and you absent-mindedly put your finger in your mouth for a taste. '
 				end
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Flip him off':
 				*clr & cla
@@ -1091,7 +1091,7 @@ if $ARGS[0] = 'russian':
 				'"<<$pcs_nickname>>, what is the meaning of this!?" your teacher says angrily.'
 				'You''re not impressed in the slightest, and boldly tell him, "One more look, and I''m telling the principal."'
 				'Flustered, Mr. Yenotin leaves the class himself for a moment. Your classmates, unsure of what just happened, softly talk with one another, asking if maybe someone else knows what that was all about. After a minute or so, Mr. Yenotin returns to class and resumes his lesson like nothing happened, carefully avoiding you with his eyes. Everyone in class is very surprised you did not get kicked out after what you just did.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end

+ 76 - 76
locations/gschool_lessonsev2

@@ -33,7 +33,7 @@ if $ARGS[0] = 'geography':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to the teacher and desperately want to turn around and strangle Lazar, but you don''t dare with the teacher now keeping a eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Lazar':
 				*clr & cla
@@ -50,14 +50,14 @@ if $ARGS[0] = 'geography':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
 				'You squeak loudly as his fingers quickly pinch your sensitive nipple and your hand quickly flies to your breast to shield it from further attack. You hear your teacher. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, the Lazar behind you is snickering.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Enjoy':
 				cla
 				npc_rel['A10'] += 1
 				'You bite your lip to silence the moan that wants to escape as you feel your molesters fingers give your nipple a quick pinch before retreating. It was a nice treat to keep class interesting.'
 				gs 'arousal', 'foreplay', 5, 'exhibitionism'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				act 'Come get some more':
 					cla
 					npc_rel['A10'] += 2
@@ -88,7 +88,7 @@ if $ARGS[0] = 'geography':
 							'You spend the rest of class with Lazar''s hand playing with your breast as you sit satisfied in a small puddle of your own juices.'
 							gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 						end
-						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -117,55 +117,55 @@ if $ARGS[0] = 'geography':
 				npc_rel['A148'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Mefodiy during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Andrey':
 				*clr & cla
 				npc_rel['A147'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Andrey during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Valentin':
 				*clr & cla
 				npc_rel['A158'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Valentin during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Evgeny':
 				*clr & cla
 				npc_rel['A151'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Evgeny during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Artem':
 				*clr & cla
 				npc_rel['A2'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Artem during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Vanya':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Vanya during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lazar':
 				*clr & cla
 				npc_rel['A149'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Irina during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Vitek':
 				*clr & cla
 				npc_rel['A9'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Vitek during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 11:
 			pcs_exhibition +=2
@@ -177,14 +177,14 @@ if $ARGS[0] = 'geography':
 			act 'Pull your shirt closed':
 				cla
 				'You quickly grasp both sides of your blouse and pull them tightly together. Artem''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'You ignore it':
 				cla
 				pcs_exhibition +=3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
 				'You let Artem continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 12:
 			*clr & cla
@@ -196,9 +196,9 @@ if $ARGS[0] = 'geography':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok' + rand(1,8) + '.jpg"></center>'
 				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
 				gs 'gschool_events', 'gosip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 13:
 			cla 
 			*clr
@@ -231,7 +231,7 @@ if $ARGS[0] = 'geography':
 							'While the boys keep to their story that they''re innocent Mrs. Sokoloff turns to you, "Miss. <<$pcs_lastname>> you''re excused to visit the toilet to wash off."'
 							*nl
 							'When you return all cleaned up, the boys are gone. Mrs. Sokoloff tells you that they''ve been sent to the principal and that it was the right thing you told her.'
-							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 						act 'Don''t tell on them':
 							*clr & cla
@@ -240,7 +240,7 @@ if $ARGS[0] = 'geography':
 							grupvalue[4] += 3
 							'You quickly start wipping the cum off you giving them dirty looks, one of the girls from another grade gives you some tissues to help. You quickly clean yourself and clothes up as best you can. Mrs. Sokoloff notices you and asks "Miss. <<$pcs_lastname>> what are you doing?"'
 							'You glances up at her and then turn to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on my from the ceiling and I was just cleaning it up." Mrs. Sokoloff looks up at the celing as if expecting something to fall from it for a few moments and then goes back to teaching class.'
-							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					end
 				end
@@ -259,7 +259,7 @@ if $ARGS[0] = 'geography':
 				'The boys are sitting there with their mouths wide open. They can''t believe what they just heard.'
 				'You continue laughing, "You really are stupid how the hell should I know that. Tell you what next time you have gym class, stand next to each other and compare your little penises."'
 				'"That''s enough! You''ve had your fun." Mrs. Sokoloff angrily says. You quickly settle down and return to the lesson.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break' 
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break' 
 			end
 			act 'Refuse to answer':
 				*clr & cla
@@ -267,7 +267,7 @@ if $ARGS[0] = 'geography':
 				'You only answer them by showing the middle finger while still reading the history book.'
 				'"Come on, <<$pcs_nickname>> share you knowledge." Lazar sighs.'
 				'As you''re about to tell them off, Mrs. Sokoloff clears hers throat, telling everyone if they keep it up they will be sent to the principal. Everybody settle down and the class goes back to normal.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break' 
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break' 
 			end
 		end
 	end
@@ -308,20 +308,20 @@ if $ARGS[0] = 'math':
 				*nl
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 			end
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 2: 
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_9.jpg"></center>'
 			'As you look around the classroom, waiting for the lesson to begin, you pause to admire the expensive looking stockings that Sonia is wearing. With a tinge of jealousy you wonder where you could buy yourself some of those stockings, and if you can afford them.'
 			'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 3:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
 			'During class there is a loud crashing sound from the back of the class, you along with everyone else in the class turn to look, in the back Evgeny is on the floor with his desk mon top of him. The whole class bursts into laughter.'
 			'You can tell that Evgeny is blushing as he quickly gets up and corrects his desk before sitting back down. After making sure he is okay, Mr. Tsarev gets the class back under control and finishes the lesson.'
 			'<center><b><font color=#90FF00><<"Evgeny Kuznetsov">></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/35.jpg"></center>'
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 4:
 			VK = rand(1,3)
 			if VK = 1 and soniaPS > 3 and NikoVolkovQW < 5 and grupTipe[61] = 4:
@@ -340,20 +340,20 @@ if $ARGS[0] = 'math':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
 				'You hear the sound of something hitting the ground then turn around to see Sonia picking up her lipstick. Sonia is wearing a transparent blouse that does a very nice job of emphasizing her breasts to anyone willing to look her way. Sonia places her lipstick in her bag when she notices you looking then gives you a warm smile before turning back to the front of the class.'
 			end
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'As the lesson goes on, you receive a message on your phone, you open the message to see that someone has sent you an image of someones penis. You can hear some snickering and you quickly look around to see who it was, but you can''t tell where it came from. Unsure what to do and not wanting to be caught looking at it, you delete the image.'
 			gs 'arousal', 'voyeur', 2, 'unknown'
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 6:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flick.jpg"></center>'
 			'You notice Arkadi continuously flicking Artem''s ear, whenever the teacher is not looking. Artem''s ear is already bright red from all the flicking and he looks like he is on the verge of tears.'
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 7 and grupTipe[61] = 4:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/wedgieb.jpg"></center>'
 			'You suddenly hear a pained groan. You glance over to see Niko letting go of Evgeny''s underwear sitting in front of him. He pulled the underwear half way up Evgeny''s back. You wince slightly, as you think of how painful that wedgie must have been.'
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 8:
 			pcs_exhibition +=2
 			'<center><b><font color=#FFC600><<"Igor Kruglov">></font></b></center>'
@@ -372,7 +372,7 @@ if $ARGS[0] = 'math':
 				'You quickly grasp both sides of your blouse and pull them tightly together. Igor''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
 				'<center><b><font color=#FFC600><<"Igor Kruglov">></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Ignore his stares':
 				*clr & cla
@@ -381,7 +381,7 @@ if $ARGS[0] = 'math':
 				'You let Igor continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
 				'<center><b><font color=#FFC600><<"Igor Kruglov">></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 9:
 			*clr & cla
@@ -394,23 +394,23 @@ if $ARGS[0] = 'math':
 				'Curious about what your classmates are talking about, you listen closely but can''t make out much of what they''re saying, but you do manage to hear...'
 				*nl
 				gs 'gschool_events', 'gosip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 10:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teachdis.jpg"></center>'
 			'You listen closely to every word Mr. Tsarev says, doing your best to learn. You occasionally notice Mr. Tsarev staring at your legs when he believes that you aren''t looking.'
-			act 'Ignore his stares and wait for the break': gt 'gschool_lessons', 'short break'
+			act 'Ignore his stares and wait for the break': gt 'gschool_lessons', 'short_break'
 			act 'Straighten your skirt':
 				*clr & cla
 				'Feeling a little creeped out at having your teacher checking out your legs, you inconspicuously try to straighten your skirt, attempting to make it look like a random afterthought and not because he''s staring. Mr. Tsarev slowly turns away and continues his lesson as if nothing has happened.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Call him out':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirt.jpg"></center>'
 				'He can''t be doing that! You pull your skirt over your legs so he can''t look at you any more and loudly say, "Mr. Tsarev, be careful! If you keep staring at me like that, your eyeballs might pop out of their sockets!" Loud laughter erupts in the classroom, and Mr. Tsarev is obviously embarrassed, as He opens his mouth to speak, but realizes that speaking might make things worst so he tries his best to get the class back under control before continuing the lesson, carefully avoiding your legs.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Spread your legs':
 				*clr & cla
@@ -426,7 +426,7 @@ if $ARGS[0] = 'math':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spreadb.jpg"></center>'
 					'The thoughts of him checking you out so sneakily causes your heart to beat rapidly in excitement, and knowing how wrong this is, turns you on further. You purposely spread your legs whenever Mr. Tsarev looks your way, and you can tell by Mr. Tsarev''s fidgeting that he getting really turned on. Unable to control yourself, you occasionally rub your exposed clitoris, preferably when Mr. Tsarev glances your way. By the end of the class your pussy lips are soaked in your juices, and without realizing, you put your finger into your mouth to taste your own juices.'
 				end
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Flip him off':
 				*clr & cla
@@ -437,7 +437,7 @@ if $ARGS[0] = 'math':
 				'He can''t do this! What a pervert! You squeeze your legs together and loudly clear your throat. When the teacher looks at you, he stares right at your extended middle finger. Everyone in class notices, and all eyes are on you now. "<<$pcs_nickname>>, what is the meaning of this!?" your teacher says angrily. You''re not impressed in the slightest, and boldly tell him, "One more look, and I''m telling the principal." Anatoly looks slightly nervous now, knowing that you caught him staring at you. He still tries to posture himself, "<<$pcs_lastname>>, get out of class!" You have no intentions of getting up, and add with a sly smile, "And I don''t know, maybe your wife?"'
 				*nl
 				'Obviously flustered, Mr. Tsarev leaves the classroom for a moment to collect his thoughts. Your classmates, unsure of what just happened, softly talk with one another, asking if maybe someone else knows what that was all about. After a minute or so, Mr. Tsarev returns to class and resumes his lesson as if nothing had happened, carefully avoiding eye contact with you. Everyone in class is very surprised that you did not get kicked out after what just happened.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
@@ -447,7 +447,7 @@ end
 if $ARGS[0] = 'help':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teacherhelp.jpg"></center>'
 	'<<$teacher>> notices that you appear to be stuck on one of the assignments and kneels down next to you. He patiently explains some easier solutions to the problems, and slowly but surely, you gather a better understanding.'
-	act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+	act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	act 'Gently touch his hand':
 		*clr & cla
 		npc_rel['A26'] += 1
@@ -456,7 +456,7 @@ if $ARGS[0] = 'help':
 		'You lightly run your fingers across the palm of his hand as you listen to his explanation. After he quickly checks to make sure that no one notices, he reciprocates and takes your hand in his left hand. Seconds later you feel his right hand resting on your back, gently rubbing it as he continues to explain a difficult to understand part of today''s lesson. You move your hips a bit closer to his, and lean closer to him as you continue listening to his explaination. When Anatoly is done with his explanation, you whisper in his ear, "You''re so smart and kind, Anatoly. I wish you would teach classes in University, so I could go to your classes for several years more when I finish here. There is still so much that you can teach me."'
 		*nl
 		'You notice a small shiver roll down his spine as he responds, "Thank you <<$pcs_firstname>>...I mean miss <<$pcs_lastname>>. I should let you get back to work." He then quickly walks back to his desk while occasionally glancing back at you.'
-		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	end
 	act 'Coerce him':
 		*clr & cla
@@ -470,7 +470,7 @@ if $ARGS[0] = 'help':
 		'Even though he''s clearly uncomfortable doing this, you feel his fingers rubbing over your wet pussy lips now. You encourage him some more, "That feels so good, Anatoly can you feel how wet I am?" Making sure that no one else is watching what he is doing, his actions grow more and more bold, as he begins to rub your pussy more firmly. He then plunges in two fingers and begins to fuck you with them. You let out light moans as your heart is pounding faster. Obviously worried that someone might notice Mr. Tsarev slowly pulls his fingers out then says, "You should let you get back to work." Anatoly gets up then walks back to his desk. He takes a quick look around to make sure that no one notices before placing his two finger in his mouth swallowing your juices.' 
 		*nl
 		'It is clear that Mr. Tsarev definitely wont be forgeting today''s lesson anytime soon.'
-		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	end
 	act 'Move the discussion to personal topics':
 		*clr & cla
@@ -492,7 +492,7 @@ if $ARGS[0] = 'help':
 			*nl
 			'Anatoly nods his head slowly before responding, "You have a really good point, maybe if I just speak with her without second guessing myself, I can actually make some progress. Thank you miss... <<$pcs_firstname>>, for your advice. You seem to have a great understanding of people in general." He gives your shoulder a light squeeze before returning to his desk.'
 		end
-		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -529,7 +529,7 @@ if $ARGS[0] = 'history':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to the teacher and desperately want to turn around and strangle Roman, but you don''t dare with the teacher now keeping a eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Roman':
 				*clr & cla
@@ -546,14 +546,14 @@ if $ARGS[0] = 'history':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
 				'You squeak loudly as his fingers quickly pinch your sensitive nipple and your hand quickly flies to your breast to shield it from further attack. You hear your teacher. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, the Roman behind you is snickering.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Enjoy':
 				cla
 				npc_rel['A10'] += 1
 				'You bite your lip to silence the moan that wants to escape as you feel your molesters fingers give your nipple a quick pinch before retreating. It was a nice treat to keep class interesting.'
 				gs 'arousal', 'foreplay', 5, 'exhibitionism'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				act 'Come get some more':
 					cla
 					npc_rel['A10'] += 2
@@ -584,7 +584,7 @@ if $ARGS[0] = 'history':
 							'You spend the rest of class with Roman''s hand playing with your breast as you sit satisfied in a small puddle of your own juices.'
 							gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 						end
-						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -596,7 +596,7 @@ if $ARGS[0] = 'history':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to the teacher and desperately want to turn around and strangle Roman, but you don''t dare with the teacher now keeping a eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Roman':
 				*clr & cla
@@ -606,7 +606,7 @@ if $ARGS[0] = 'history':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
 				'You ignore the teacher and turn around and slap Roman with all your force. Roman blinks a moment then slaps you back, knocing you out of your chair. Students start murmuring about what happened, while some laugh.'
 				'The teachers voice cuts through the noise. "That''s enough of that mr Yakovlev, go to the principals office."'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 6:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
@@ -633,56 +633,56 @@ if $ARGS[0] = 'history':
 				npc_rel['A146'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Marcus during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lena':
 				*clr & cla
 				npc_rel['A20'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Lena during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Roman':
 				*clr & cla
 				npc_rel['A157'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Roman during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Petka':
 				*clr & cla
 				npc_rel['A6'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Petka during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lera':
 				*clr & cla
 				npc_rel['A21'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Lera during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lina':
 				*clr & cla
 				npc_rel['A19'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Lina during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Igor':
 				*clr & cla
 				npc_rel['A4'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Igor during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Niko':
 				*clr & cla
 				npc_rel['A189'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Niko during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 12:
 			gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 1, 0, 0
@@ -695,14 +695,14 @@ if $ARGS[0] = 'history':
 			act 'Pull your shirt closed':
 				cla
 				'You quickly grasp both sides of your blouse and pull them tightly together. Petka''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'You ignore it':
 				cla
 				pcs_exhibition +=3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
 				'You let Petka continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 13:
 			*clr & cla
@@ -714,9 +714,9 @@ if $ARGS[0] = 'history':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok' + rand(1,8) + '.jpg"></center>'
 				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
 				gs 'gschool_events', 'gosip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -757,7 +757,7 @@ if $ARGS[0] = 'shop':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to Mr. Kuznetsov and desperately want to turn around and strangle Dan, but you don''t dare with the teacher now keeping a eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Dan':
 				*clr & cla
@@ -774,14 +774,14 @@ if $ARGS[0] = 'shop':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
 				'You squeak loudly as his fingers quickly pinch your sensitive nipple and your hand quickly flies to your breast to shield it from further attack. You hear Mr. Kuznetsov. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, the Dan behind you is snickering.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Enjoy':
 				cla
 				npc_rel['A10'] += 1
 				'You bite your lip to silence the moan that wants to escape as you feel your molesters fingers give your nipple a quick pinch before retreating. It was a nice treat to keep class interesting.'
 				gs 'arousal', 'foreplay', 5, 'exhibitionism'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				act 'Come get some more':
 					cla
 					npc_rel['A10'] += 2
@@ -812,7 +812,7 @@ if $ARGS[0] = 'shop':
 							'You spend the rest of class with Dan''s hand playing with your breast as you sit satisfied in a small puddle of your own juices.'
 							gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 						end
-						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -823,7 +823,7 @@ if $ARGS[0] = 'shop':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to the teacher and desperately want to turn around and strangle Vasily, but you don''t dare with the teacher now keeping a eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap <<$rand_boy>>':
 				*clr & cla
@@ -850,56 +850,56 @@ if $ARGS[0] = 'shop':
 				npc_rel['A1'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Dimka during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Viktoria':
 				*clr & cla
 				npc_rel['A15'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Viktoria during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Dan':
 				*clr & cla
 				npc_rel['A10'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Dan during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Vitek':
 				*clr & cla
 				npc_rel['A9'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Vitek during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Vasily':
 				*clr & cla
 				npc_rel['A11'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Vasily during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Paulina':
 				*clr & cla
 				npc_rel['A24'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Paulina during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Fedor':
 				*clr & cla
 				npc_rel['A5'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Fedor during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Marcus':
 				*clr & cla
 				npc_rel['A146'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Marcus during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 10:
 			pcs_exhibition +=2
@@ -911,7 +911,7 @@ if $ARGS[0] = 'shop':
 			act 'Pull your shirt closed':
 				cla
 				'You quickly grasp both sides of your blouse and pull them tightly together. Marcus''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'You ignore it':
 				cla
@@ -919,7 +919,7 @@ if $ARGS[0] = 'shop':
 				npc_rel['A146'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
 				'You let Marcus continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 11:
 			*clr & cla
@@ -931,9 +931,9 @@ if $ARGS[0] = 'shop':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok' + rand(1,8) + '.jpg"></center>'
 				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
 				gs 'gschool_events', 'gosip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -1027,7 +1027,7 @@ if $ARGS[0] = 'shop punishment':
 													gs 'arousal', 'bj', 5, 'rough', 'bound'
 													gs 'arousal', 'end'
 													gs 'stat'
-													act 'Leave school': gt 'gschool_grounds', 'main'
+													act 'Leave school': gt 'gschool_lessons', 'short_break'
 												end
 											end
 										end

+ 59 - 59
locations/gschool_lessonsev3

@@ -26,7 +26,7 @@ if $ARGS[0] = 'literature':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
 				*nl
 				'You quickly look away, and spend the rest of class trying to avoid eye contact with Igor.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Defend Igor':
 				*clr & cla
@@ -45,7 +45,7 @@ if $ARGS[0] = 'literature':
 				'Unsurprisingly, she''s somehow made this about herself. "No, I''m just saying you can''t believe everything you hear. Haven''t you had people accuse you of saying or doing something that you never did?"'
 				*nl
 				'Lizaveta is silent for a long moment before her expression softens slightly. "Whatever," she mutters in defeat. You think she''s going to leave it at that, but she gives Igor one last look of disgust as she slams his paper back on his desk before finally walking back to her seat, her group of girls trailing behind her. With them gone, Igor takes a deep breath and relaxes into his seat. "Thanks," he silently mouthes to you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Join in':
 				*clr & cla
@@ -54,7 +54,7 @@ if $ARGS[0] = 'literature':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
 				*nl
 				'"It is pretty weird how he always follows Dimka around," you chime in. Lizaveta is quick to agree, and together with the other girls, you continue to mock him until Ms. Braakman finally steps in to put an end to it.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 3:
 			*clr & cla
@@ -100,7 +100,7 @@ if $ARGS[0] = 'literature':
 					npc_rel['A157'] -= 3
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/events/rejection.jpg"></center>'
 					'Knowing how aggressive the gopnik can be, you gently push his hand away and hope that doesn''t provoke him. From the corner of your eye, you catch Roman glaring at you, his eyes narrowed and jaw clenched in anger. You start to prepare yourself for what he''s going to say, but to your surprise he goes back to drawing in his notebook. For the rest of the class, Roman keeps his hands to himself.'
-					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 				act 'Spread your legs':
 					*clr & cla
@@ -133,7 +133,7 @@ if $ARGS[0] = 'literature':
 						*nl
 						'Soon you feel your body tense as the waves of your orgasm wash over you. You ride out the pleasure in silence until it finally passes, leaving you light-headed and dizzy. You look over to Roman and find him admiring his fingers, wet and shining with your juices. "Well?" He asks, and you realize that he needs to clean them off. Readjusting your uniform, you start to get up to go get a tissue, but Roman laughs and shakes his head. Without warning, he uses your skirt to clean up, "This''ll do."'
 					end
-					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			end
 		elseif scooltiperand = 7:
@@ -147,7 +147,7 @@ if $ARGS[0] = 'literature':
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/literature/events/humpday.mp4"></video></center>'
 				*nl
 				'You smile and stick your ass out more, encouraging her to keep going. Before you know it, a few other students have gathered around to watch and laugh. Eventually, Arkadi takes out his phone and starts recording, which prompts a few other girls to squeeze into the frame and start humping each other.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Push her away':
 				*clr & cla
@@ -155,7 +155,7 @@ if $ARGS[0] = 'literature':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
 				*nl
 				'Unamused, you push Anushka off you. "I was only fucking around. Christ, you''re no fun," she says with a scowl.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 8:
 			*clr & cla
@@ -186,12 +186,12 @@ if $ARGS[0] = 'reading':
 		'"Screw reading, <<$pcs_nickname>>''s mouth is better suited for sucking cock." You overhear someone say from behind you. You turn around and it''s none other than Petia staring back at you. Unashamed, a perverted smile spreads across his face. You get the feeling he''s undressing you with his eyes.'
 		act 'Say nothing':
 			cla
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 !!any spot with out a image Akossi does not want it cleared but to have the text just add to the existing text and image from the previous acts
 			*nl
 			'Unable to respond, you turn around without confronting him. You hear him chuckle and mutter something incoherent under his breath, but he doesn''t say anything else for the remaining class period. Replaying the encounter in your head, a part of you wonders if saying nothing was the right thing to do.'
 			cla
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Tell him he''s right':
 			gs 'fame', 'pav', 'sex', 1
@@ -199,7 +199,7 @@ if $ARGS[0] = 'reading':
 			*nl
 			'"You''re right, and I''m pretty damn good at it, too," You say with a playful smile. A few kids nearby overhear you and start to whisper amongst themselves, the girls quick to bash you and the guys eagerly wanting to put your skills to the test. Before you know it, the whole class is stealing glances at you, some looking disgusted while others lustful. You''re sure that by the end of the day, the whole school will know about how proud you are of your cocksucking skills.'
 			cla
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Tell him to fuck off':
 			cla
@@ -220,13 +220,13 @@ if $ARGS[0] = 'reading':
 				*nl
 				'You join the three gopniks and continue to mercilessly berate Petia until he''s saved by Ms. Braakman telling everyone to get back to work.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Get back to work':
 				*nl
 				'Leaving it to the gopniks to finish what you started, you go back to work.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
 		act 'Insult him':
@@ -237,7 +237,7 @@ if $ARGS[0] = 'reading':
 			*nl
 			'"<<$PCs_lastname>>, I don''t want to hear that kind of language in my class!" Ms. Braakman shouts, barely managing to speak above the noise in the class.'
 			cla
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 	elseif scooltiperand = 2:
 		pcs_mood -= 10
@@ -420,7 +420,7 @@ if $ARGS[0] = 'english':
 				*nl
 				'Lera and Lena repeat the words a few times until they can say it with confidence. When they ask you what the words meant, you explain it to them in Russian. "Holy shit, that''s amazing! I can''t wait to use it on some dickhead at the disco!" Lera laughs excitedly.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Play a cruel trick on them':
 				persuas_exp +=10
@@ -430,7 +430,7 @@ if $ARGS[0] = 'english':
 				*nl
 				'Lera and Lena seem surprised with how much you say, but you reassure them it''s a really good insult; the worst of the worst. With a smile, they repeat the sentence, completely unaware of what they''re actually saying.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 4:
 			if pcs_makeup > 1:
@@ -473,7 +473,7 @@ if $ARGS[0] = 'english':
 				'The girls are staring at you in silence, and Veronika is looking at you in disbelief. Did you go too far? You start to worry you did something wrong, but then you notice the smallest hint of a smile on Veronika''s face.'
 				'"S-screw you, <<$pcs_nickname>>," one of the girls stutters as she and her group quickly retreat with their tails between their legs.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Mock her':
 				!!no image, just have it popup underneath the previous text on the same screen
@@ -481,7 +481,7 @@ if $ARGS[0] = 'english':
 				*nl
 				'You don''t hesitate to join the other girls in mocking Veronika. She turns to glare at you, but other than that she doesn''t react to your or the other girl''s insults. She really is an ice queen.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
@@ -528,7 +528,7 @@ if $ARGS[0] = 'working':
 				*nl
 				'"Me?! You''re the one that was having trouble!" Lera objects with a smile.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
 				pcs_mood -=10
 				npc_rel['A20'] -=2
@@ -537,7 +537,7 @@ if $ARGS[0] = 'working':
 				*nl
 				'"Are you kidding me? Don''t offer to help if you don''t know shit!" Lena snaps as she snatches her paper back from you. You laugh nervously and try to apologize, but Lera is having none of it and quickly fires back another insult.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
 		act 'Give them the wrong answers':
@@ -545,14 +545,14 @@ if $ARGS[0] = 'working':
 				persuas_exp +=10
 				'"If you''re having trouble, I can help," you suggest with a small smile. Lera and Lena exchange a wary look before nodding their heads. Carefully, you start to feed them the wrong answers, and by the time you''re finished helping them, they''re none the wiser.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
 				persuas_exp +=15
 				npc_rel['A20'] -= 5
 				npc_rel['A21'] -= 5
 				'"If you''re having trouble, I can help," you suggest with a small smile. Lera and Lena exchange a wary look before nodding their heads. You try to convince them that your wrong answers are right, but you''re unable to convince them and they realize what you''re trying to do. With some unsettlingly specific threats of violence against you, Lera and Lena scare you off.'
 				cla
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
 		act 'Ignore them': 'You tell yourself it''s better not to get involved with them. Moments later, you hear things starting to get heated between the two of them until they''re outright arguing about who was wrong and who was right.'
@@ -566,14 +566,14 @@ if $ARGS[0] = 'working':
 			grupvalue[3] += 2
 			'You smile and nod your head, "Sure." Ivan sighs in relief and makes room for you to pull up a seat next to him. His mistakes are easy to fix, so you end up finishing rather quickly.'
 			cla
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Make up an excuse':
 			npc_rel['A3'] -=3
 			grupvalue[3] -=3
 			'"Sorry, but I''ve still got a lot to finish," you reply, pointing to your own work. Ivan''s smile fades and he looks disappointed, but he shrugs his shoulders and leaves you alone.'
 			cla
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -597,7 +597,7 @@ if $ARGS[0] = 'help_radomir':
 			*nl
 			'"You didn''t lose it, I took it back since you weren''t doing anything with it," you reply. Hearing this, Radomir tries to explain that he had just turned around for a moment and asks you to give him another chance, but you refuse. Angry, he mutters something under his breath before leaving you alone.'
 			cla
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Wait for him to finish':
 			pcs_grades -= 1
@@ -610,7 +610,7 @@ if $ARGS[0] = 'help_radomir':
 			*nl
 			'Angry and a bit panicked, you start to ask around for your paper, but no one knows where it is. In the end, you have nothing to turn in, which disappoints Ms. Braakman and earns you a bad grade in class today.'
 			cla
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 	elseif scooltiperand = 3:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/39.jpg"></center>'
@@ -674,7 +674,7 @@ if $ARGS[0] = 'music':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to Mr. Vasilyev and desperately want to turn around and strangle Radomir, but you don''t dare with the teacher now keeping a eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Slap Radomir':
 				*clr & cla
@@ -691,14 +691,14 @@ if $ARGS[0] = 'music':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
 				'You squeak loudly as his fingers quickly pinch your sensitive nipple and your hand quickly flies to your breast to shield it from further attack. You hear your teacher. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, the Radomir behind you is snickering.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Enjoy':
 				cla
 				npc_rel['A154'] += 1
 				'You bite your lip to silence the moan that wants to escape as you feel your molesters fingers give your nipple a quick pinch before retreating. It was a nice treat to keep class interesting.'
 				gs 'arousal', 'foreplay', 5, 'exhibitionism'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				act 'Come get some more':
 					cla
 					npc_rel['A154'] += 2
@@ -729,7 +729,7 @@ if $ARGS[0] = 'music':
 							'You spend the rest of class with Radomir''s hand playing with your breast as you sit satisfied in a small puddle of your own juices.'
 							gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 						end
-						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -740,14 +740,14 @@ if $ARGS[0] = 'music':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to the teacher and desperately want to turn around and strangle Lavrenti, but you don''t dare with the teacher now keeping a eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				if n_tanga = 3:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_6.jpg"></center>'
 					'As you sit in the classroom you hear Katja asking from behind you, "<<$pcs_nickname>>, I dropped my pen, be a dear and pick it up for me?" You sigh and look under her desk, immediately noticing her bare pussy between her widely spread legs. The little minx is doing it on purpose! A bit flustered, you pick up her pen and hand it back to her. When you do, she gives you an innocent grin and gets back to what she was doing as if nothing happened.'
-					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				else
-					gt 'gschool_lessons', 'short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 			act 'Slap Lavrenti':
@@ -786,56 +786,56 @@ if $ARGS[0] = 'music':
 				npc_rel['A14'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Katja during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Radomir':
 				*clr & cla
 				npc_rel['A154'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Radomir during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lavrenti':
 				*clr & cla
 				npc_rel['A155'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Lavrenti during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Valentin':
 				*clr & cla
 				npc_rel['A158'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Valentinduring class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lariska':
 				*clr & cla
 				npc_rel['A13'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Lariska during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lina':
 				*clr & cla
 				npc_rel['A19'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Lina during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Bella':
 				*clr & cla
 				npc_rel['A22'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Bella during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Petia':
 				*clr & cla
 				npc_rel['A159'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Petia during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 14:
 			pcs_exhibition +=2
@@ -847,7 +847,7 @@ if $ARGS[0] = 'music':
 			act 'Pull your shirt closed':
 				cla
 				'You quickly grasp both sides of your blouse and pull them tightly together. Petia''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'You ignore it':
 				cla
@@ -855,7 +855,7 @@ if $ARGS[0] = 'music':
 				npc_rel['A159'] += 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
 				'You let Petiacontinue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 15:
 			*clr & cla
@@ -868,9 +868,9 @@ if $ARGS[0] = 'music':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok<<urand>>.jpg"></center>'
 				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
 				gs 'gschool_events', 'gosip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -922,14 +922,14 @@ if $ARGS[0] = 'art':
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to the teacher and desperately want to turn around and strangle Anushka, but you don''t dare with Mr. Vasilyev now keeping a eye on you.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				if n_tanga = 3:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_6.jpg"></center>'
 					'As you sit in the classroom you hear Katja asking from behind you, "<<$pcs_nickname>>, I dropped my pen, be a dear and pick it up for me?" You sigh and look under her desk, immediately noticing her bare pussy between her widely spread legs. The little minx is doing it on purpose! A bit flustered, you pick up her pen and hand it back to her. When you do, she gives you an innocent grin and gets back to what she was doing as if nothing happened.'
-					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				else
-					gt 'gschool_lessons', 'short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 			act 'Slap Anushka':
@@ -962,56 +962,56 @@ if $ARGS[0] = 'art':
 				npc_rel['A150'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Erast during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Julia':
 				*clr & cla
 				npc_rel['A12'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Julia during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Katja':
 				*clr & cla
 				npc_rel['A17'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Katja during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Albina':
 				*clr & cla
 				npc_rel['A23'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Albina during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Anushka':
 				*clr & cla
 				npc_rel['A144'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Anushka during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Natasha':
 				*clr & cla
 				npc_rel['A16'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Natasha during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Feofan':
 				*clr & cla
 				npc_rel['A152'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Feofan during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Zinaida':
 				*clr & cla
 				npc_rel['A142'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				'You sit next to Zinaida during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 12:
 			pcs_exhibition +=2
@@ -1023,7 +1023,7 @@ if $ARGS[0] = 'art':
 			act 'Pull your shirt closed':
 				cla
 				'You quickly grasp both sides of your blouse and pull them tightly together. Feofan''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'You ignore it':
 				cla
@@ -1031,7 +1031,7 @@ if $ARGS[0] = 'art':
 				npc_rel['A152'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
 				'You let Feofan continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 13:
 			*clr & cla
@@ -1044,9 +1044,9 @@ if $ARGS[0] = 'art':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok<<urand>>.jpg"></center>'
 				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
 				gs 'gschool_events', 'gosip'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short break'
+			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 	end
 end

+ 28 - 28
locations/gschool_lunch

@@ -10,7 +10,7 @@ if $ARGS[0] = 'lesson_end':
 
 	else
 		if school_lunch = 1:
-			school_event_hour = 0 & gt 'gschool_grounds', 'main'
+			school_event_hour = 0 & gt 'gschool_lessons', 'short_break'
 		elseif NikoVolkovQW = 5 and NikoEv = 5 and NikoDate = 0 and NikoDate_Day ! daystart:
 			school_lunch = 1 & gt 'NikoDates', 'Hallway Strip'
 		elseif NikoVolkovQW = 10 and NikoEv = 12:
@@ -128,7 +128,7 @@ if $ARGS[0] = 'break':
 
 	act 'Relax in a classroom':
 		cls
-		minut += 60
+		minut += 10
 		urand = rand(0, 20)
 		gs 'stat'
 		if rand(1,6) = 1 and pcs_vag > 12 and mesec <= 0:
@@ -140,13 +140,13 @@ if $ARGS[0] = 'break':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/peremena<<urand>>.jpg"></center>'
 			'You decide to spend your break in a classroom. As you enter, you find several of your classmates already sitting there: the <a href="exec:gt ''Sgrup1''">smart kids</a> decided to get an early start on their homework assignments, while the <a href="exec:gt ''Sgrup5''">outcasts</a> are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	end
 
 	act 'Hang out in the hallway':
 		cls
-		minut += 60
+		minut += 10
 		gs 'stat'
 
 		if soniaPS = 5 and rand(1,6) = 1:
@@ -164,27 +164,27 @@ if $ARGS[0] = 'break':
 					pcs_horny += 10
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/sonia.teach1,0.jpg"></center>'
 					'When the teacher has had enough of her mouth, he lets her stand and turn around, having her put her hands on his desk before he slides his slick cock up her pussy, fucking her from behind. He''s quite rough about it, but Sonia doesn''t seem to mind at all and moans like a wanton whore. Realizing the loud moans might attract more attention from outside the class, you leave before anyone else finds you staring.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/school.jpg"></center>'
 			'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. The <a href="exec:gt ''Sgrup3''">cool kids</a> are hanging out in one area, and on the other side of the hallway the <a href="exec:gt ''Sgrup2''">sporty kids</a> are talking about their upcoming competitions.'
 
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end	
 	end
 
 	act 'Go to the restrooms':
 		cls
-		minut += 60
+		minut += 10
 		urand = rand(0, 12)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/toilet.jpg"></center>'
 		'You need to use the restroom and as you enter you notice a lot of beautiful girls from your school there. They check their make-up, doing minor touch-ups while they gossip about their classmates who happen to not be there. Some people are standing by the windows, smoking. The <a href="exec:gt ''Sgrup4''">Gopniks</a> from your class are standing near the toilets.'
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 
 		if rand(0,30) >= 25:
 			if soniaPS = 3:soniasexrand = 1
@@ -200,7 +200,7 @@ if $ARGS[0] = 'break':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/toilet.jpg"></center>'
 				'When you enter the restroom you see Sonia, giving some kid you don''t know a skilful blowjob. She''s very much focused on her task, doing her best to make him feel good.'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			elseif soniasexrand = 2:
 				cls
 				pcs_horny += 15
@@ -208,7 +208,7 @@ if $ARGS[0] = 'break':
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,'+rand(0,3)+'.jpg"></center>'
 				'When you enter the restroom you see Sonia, getting fucked by some guy you''ve never seen before. She''s very much focused on her task, doing her best to make him feel good.'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			elseif soniasexrand = 3:
 				cls
 				pcs_horny += 20
@@ -221,7 +221,7 @@ if $ARGS[0] = 'break':
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/sonia.orgy0,0.jpg"></center>'
 					'One of the guys brought a collar, and he puts it around Sonia''s neck for a bit of roleplay, "You''re ours now... ain''t that right, whore?" Sonia, content to play along as long as she gets dicks to suck on, happily agrees and begins to deepthroat the guys one by one, massaging the others in turn with her hands to make sure no one feels left out. Sometimes an impatient tug on the leash tells her to switch cocks, when she''s been sucking on one for too long. Having seen enough, you leave them to their fun and head for your next class.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -230,11 +230,11 @@ if $ARGS[0] = 'break':
 	if school_period = 6: 
 		act 'Stay in cafeteria':
 			cls
-			minut += 60
+			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
 			'You stay in the cafeteria where some of the <a href="exec:gt ''Sgrup''">teachers</a> are eating or watching over the kids making sure there is no trouble.'
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	end
 
@@ -244,10 +244,10 @@ if $ARGS[0] = 'break':
 
 			if zverRageQW = 0:zverRageQW = 1
 
-			minut += 60
+			minut += 5
 			gs 'stat'
 			'You spread rumours about how Christina Zvereva has sex with Mr. Pavlovich, the P.E. teacher. The rumour spreads like wildfire: within the hour, everyone knows how she stays ahead.'
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -290,14 +290,14 @@ if $ARGS[0] = 'marcus_event':
 				'<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.'
 
-				gs 'gschool_lessons','short break'
+				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 but thank you Marcus, but I would love to sit with you." With that he buys his lunch, you find a table and the two of you sit together while he eats his lunch, the two of you talk for the whole lunch period.'
 
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
@@ -335,14 +335,14 @@ if $ARGS[0] = 'marcus_event':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
 					'"Sure, I would love to have lunch with you!" With that, the two of you walk to the cafeteria together. He buys you both lunch, you find a table and sit together while you eat and talk for the rest lunch period.'
 
-					gs 'gschool_lessons','short break'
+					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 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, the two of you talk for the rest lunch period.'
 
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -381,7 +381,7 @@ if $ARGS[0] = 'events':
 					'As Katja gets closer to her orgasm, she firmly clutches your hair and roughly pulls your face even harder into her crotch, encouraging you to work harder. A short while later, you can feel her pussy convulsing against your mouth, a few drops of girl cum squirting out and landing on your mouth. You slowly keep lapping at her twitching pussy, bringing her down carefully while she recovers from her orgasm. When you look up into her eyes, you see her staring down at you lovingly for a second, before pushing your face away and quickly straightening her clothes.'
 					'"Damn, next period is about to start! I''m sorry <<$pcs_nickname>>, I owe you one!" she apologizes, as she quickly gathers her things and leaves the closet. You''re hornier than ever, but you need to get going too.'
 
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -481,7 +481,7 @@ if $ARGS[0] = 'events':
 				'"That was great, <<$name>>, I see you''ve certainly earned your reputation. We''ll definitely be doing this more often, maybe next time I''ll make sure the other boys can have a turn as well. We''ll come find you when we want you. Understood?"'
 				*nl
 				'You''re not looking forward to the prospect, but not knowing what else to do you just nod. After the guys leave the bathroom you quickly have a drink, trying to wash the nasty taste of his cum out of your mouth.'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end
 
@@ -621,9 +621,9 @@ if $ARGS[0] = 'events':
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/teasefo.mp4"></video></center>'
 				'You turn around briefly and suck on your fingers a moment before flipping him off.'
 
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 
 		act 'Flirt back':
@@ -658,14 +658,14 @@ if $ARGS[0] = 'events':
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/flipoff.mp4"></video></center>'
 					'You can not believe he asked that, well yes you can. That seems to be the only thing boys are even remotely capable of thinking about. "No! What kind of girl do you think I am anyways? Whatever, I don''t even want to know." With that you turn and storm off, leaving him behind.'
 
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 				act 'Not today':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hallflirt.jpg"></center>'
 					'You pause for a bit, acting like you are giving his suggestion some serious thought, just to fuck with him, until you realize you''re not pretending: you really are considering it! Damn, maybe you are a bit of a slut. After a few moments you shake your head. "You seem nice but I hardly know you, maybe some other time, but now I need to run. Talk to you later." With that you hurry off leaving him unsure if this was a good or bad thing.'
 
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -756,7 +756,7 @@ if $ARGS[0] = 'bjs':
 					'"That was great, <<$name>>, I see you''ve certainly earned your reputation. We''ll definitely be doing this more often, maybe next time I''ll make sure the other boys can have a turn as well. We''ll come find you when we want you. Understood?"'
 					*nl
 					'You''re not looking forward to the prospect, but not knowing what else to do you just nod. After the guys leave the bathroom you quickly have a drink, trying to wash the nasty taste of his cum out of your mouth.'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 !!new option that comes at a price
@@ -811,7 +811,7 @@ if $ARGS[0] = 'bjs':
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/toilet.jpg"></center>'
 			'You walk to the restroom and carefully look inside, making sure not to draw any attention to yourself. You see Sonia resting on her knees, a cock deep down her throat. She must''ve had a lot of practice, because it looks like she has no gag reflex whatsoever. Just around the corner there are two more Gopniks stroking their dicks, getting them nice and hard for when it''s their turn. You watch Sonia''s head bob up and down the cock for a few minutes before you decide to leave, while you still can.'
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 		act'Quickly get away from them':
 			cla

+ 20 - 20
locations/gschool_office

@@ -3,15 +3,15 @@
 if $ARGS[0] = 'principal':
 	cls
 	gs 'stat'
-    '<center><b><font color="maroon">Principal''s Office</font></b></center>'
-    '<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/office.jpg"></center>'
+	'<center><b><font color="maroon">Principal''s Office</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/office.jpg"></center>'
 	'The office is, in a word, impressive: It must have cost a full year''s worth of the school''s budget to decorate it. At least now you know why so much of the rest of the school has cracked and faded paint, or is in need of repair that never seems to happen - all the money is spent on this one room.'
 	if detention_set = 2:
 		'You take a seat at Principal <<$npc_lastname[''134'']>>''s desk and wait for her to address you with an exacerbated tone: "I usually give pupils the choice of detention so that I don''t have to punish them personally... but you have abused my leniency one time too many. I''m going to teach you not to insult my kindness." She is clearly angry and you can almost already feel the pain on your butt that you are about to receive.'
 		act 'Accept the inevitable': gt 'gschool_office', 'spanked'
 	elseif demerit > 20:
 		'You take a seat at Principal <<$npc_lastname[''134'']>>''s desk and wait for her to address you with an exacerbated tone: "What did you do this time, <<$pcs_lastname>>? No, I don''t want to know. I really don''t care what it is. You obviously have no respect for me or your teachers." She looks over your file some more and shakes her head slightly. "You have been here enough and you know what comes next. So, what will it be this time? Spanking, or perhaps Saturday detention?" She seems more than a bit annoyed that you appear to be immune to her punishment system... or maybe that you are that troubled of a student.'
-		act 'Choose detention':detention_set = 1 & gt 'gschool_lessons', 'schedule'
+		act 'Choose detention':detention_set = 1 & gt 'gschool_lessons', 'short_break','office'
 		act 'Choose spanking': gt 'gschool_office', 'spanked'
 !!		if demerit >= 50:act 'Choose suspension': gt 'gschool_lessons', 'suspension'
 !!		act 'Call Parents': gt 'gschool_lessons', 'Call Parents' - I will add this one in later as it will be a bit of work to write and tie in events at home.
@@ -19,11 +19,11 @@ if $ARGS[0] = 'principal':
 		'You take a seat at her desk and wait for Principal <<$npc_lastname[''134'']>> to address you. "This is becoming a routine with you; I feel like I am seeing you every day! What has changed, <<$pcs_lastname>>? You used to be such a good girl, perhaps a bit quiet, but now? This is not the way to get attention." She looks over your file some more and shakes her head slightly.'
 		'"We can''t have you keep getting in trouble like this - I will have to punish you." She looks directly at you for a moment to make sure you understand that when you cause problems, you will be getting punished. "I believe in giving the students a voice in their future, so I will let you decide: Saturday detention, or a spanking, right now - which will it be?"'
 
-		act 'Choose detention': detention_set = 1 & gt 'gschool_lessons', 'schedule'
+		act 'Choose detention': detention_set = 1 & gt 'gschool_lessons', 'short_break','office'
 		act 'Choose spanking': gt 'gschool_office', 'spanked'
 	else
 		'You take a seat at Principal <<$npc_lastname[''134'']>>''s desk and wait for her to address you. "Do you know why you are here, <<$pcs_lastname>>?", before you have a chance to reply she continues on. "It was a rhetorical question - we both know why you are here. You are here because you got in trouble." She pauses to look over at the folder in front of her. "Your file shows you have mostly stayed out of trouble until now. I hope this is only a minor lapse in judgment and not a new trend from you. We won''t get into what you did, just understand this is a warning. Straighten yourself out or there will be consequences. Now, return to class."'
-		act 'Go to class':gt 'gschool_lessons', 'schedule'
+		act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 	end
 end
 
@@ -51,7 +51,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 		end
 		act 'Flirt/rebel':
 			principal_spank = 6
@@ -70,7 +70,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 		end
 	elseif principal_spank <= 10 and detention_set ! 2:
 !!Spanked Bare Bottom
@@ -88,7 +88,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 		end
 		act 'Flirt/rebel':
 			principal_spank = 11
@@ -107,7 +107,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 		end
 	elseif principal_spank <= 15 and detention_set ! 2:
 !!Spanked Leather Paddle
@@ -125,7 +125,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 		end
 		act 'Flirt/rebel':
 			principal_spank = 16
@@ -144,7 +144,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 		end
 	elseif principal_spank <= 20 or detention_set = 2:
 !!Spanked Wooden Paddle
@@ -163,7 +163,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 		end
 		act 'Flirt/rebel':
 			principal_spank += 1
@@ -179,7 +179,7 @@ if $ARGS[0] = 'spanked':
 			*nl
 			'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, about the time your butt has taken on a nice shade of red, she roughly lifts you off her knees and back on your feet. Her hands rest on your hips and as she stands up to face you, one hand slips down to your bare ass and stays there for just a moment... Then she removes her hands and points at the door, her expression unreadable. "You are playing a very dangerous game, young lady. Get back to class." You head for the door, putting a bit of extra sway into your hips and very slowly pulling your panties back up as you go, giving her an extra-long look at your cherry-red butt cheeks. You don''t dare to look back but you are almost certain that Principal <<$npc_lastname[''134'']>> had her eyes on your ass right until the door closed behind you.'
 
-			act 'Go to class':gt 'gschool_lessons', 'schedule'
+			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 		end
 	else
 !!this happens if Sveta choose to flirt/rebel 5 times while getting spanked by the wooden paddle and chooses spanking again then it goes to this.
@@ -210,7 +210,7 @@ if $ARGS[0] = 'spanked':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Go to class':gt 'gschool_lessons', 'schedule'
+				act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 			end
 			act '"Don''t like wearing them"':
 				*clr
@@ -233,7 +233,7 @@ if $ARGS[0] = 'spanked':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Go to class':gt 'gschool_lessons', 'schedule'
+					act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 				end
 				act '"No"':
 					*clr
@@ -282,7 +282,7 @@ if $ARGS[0] = 'spanked':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Go to class':gt 'gschool_lessons', 'schedule'
+				act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 			end
 			act '"I like wearing it':
 				*clr
@@ -307,7 +307,7 @@ if $ARGS[0] = 'spanked':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Go to class':gt 'gschool_lessons', 'schedule'
+					act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 				end
 				act 'No':
 					*clr
@@ -356,7 +356,7 @@ if $ARGS[0] = 'spanked':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Go to class':gt 'gschool_lessons', 'schedule'
+				act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 			end
 			act '"I like the way it feels"':
 				*clr
@@ -382,7 +382,7 @@ if $ARGS[0] = 'spanked':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Go to class':gt 'gschool_lessons', 'schedule'
+					act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 				end
 				act 'No':
 					*clr
@@ -547,7 +547,7 @@ if $ARGS[0] = 'whore2':
 					'Once the Principal deems the dildo clean enough, she removes it from your mouth, gets off the desk and pulls you off as well. She leans against the table and points at the door. "Get your shit and remove yourself from my office right now. If you hurry, you can make it back into the hall and get dressed before the next bell." Your eyes widen slightly at the thought of being forced out into a hall full of the classmates, naked as you are, but the expression on her face and her previous cruelties leave no doubt in your mind that she is serious. You quickly gather your clothes and hurry out of the office.'
 					*nl
 					'Once out in the hall, you quickly get dressed and try your best to ignore your burning asshole as you do. You barely finish getting yourself in order before the bell rings and the hall fills up with your fellow students. It takes you a moment to realize that the Principal was fucking you for a full class - no wonder your ass started hurting so much. With a new understanding for what school punishment can entail, you go to your next class, trying not to walk too bowlegged.'
-					act 'Go to class':gt 'gschool_lessons', 'schedule'
+					act 'Go to class':gt 'gschool_lessons', 'short_break','office'
 				end
 			end
 		end

+ 19 - 19
locations/gschool_sex

@@ -2,7 +2,7 @@
 
 !!After school bjs for gopnik friends
 if $ARGS[0] = 'suck':
-    $location_type = 'event'
+	$location_type = 'event'
 	aftgopbjrand = rand(0, 2)
 
 	if aftgopbjrand ! 0:
@@ -184,16 +184,16 @@ if $ARGS[0] = 'afterschool':
 						gs 'cum_manage'
 						orgasm += 1
 						gs 'stat'
-					    '<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katjacumkiss.jpg"></center>'
-					    'Feeling you orgasm, Ivan redoubles his efforts and with in minutes, he pulls out of your ass and begins shooting spurts of cum all over your ass and Katja''s face.'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katjacumkiss.jpg"></center>'
+						'Feeling you orgasm, Ivan redoubles his efforts and with in minutes, he pulls out of your ass and begins shooting spurts of cum all over your ass and Katja''s face.'
 						*nl
-					    'Ivan sits back on his heels, sweating as he catches his breath, watching Katja lick all his cum off your ass. Once she is done you rise up sitting next to her. Seeing cum running down her face you lean over and lick Ivan''s sperm off her face. Within moments Katja and you are kissing each other with cum coated tongues, sharing Ivan''s sperm between you.'
-					    'Watching this Ivan only says one word. "Damn!"'
+						'Ivan sits back on his heels, sweating as he catches his breath, watching Katja lick all his cum off your ass. Once she is done you rise up sitting next to her. Seeing cum running down her face you lean over and lick Ivan''s sperm off her face. Within moments Katja and you are kissing each other with cum coated tongues, sharing Ivan''s sperm between you.'
+						'Watching this Ivan only says one word. "Damn!"'
 						*nl
-					    'Shortly after you all start getting dressed. Ivan looks at the two of you. "Girl''s we got to do this again some time, what do you say?"'
-					    'Both of you turn to look at each other at Ivan''s offer and you both start giggling, before Katja turns to look at him. "If your a good boy we''ll see." But both of your looks promise him, good or bad, both of you want another go as badly as he does.'
+						'Shortly after you all start getting dressed. Ivan looks at the two of you. "Girl''s we got to do this again some time, what do you say?"'
+						'Both of you turn to look at each other at Ivan''s offer and you both start giggling, before Katja turns to look at him. "If your a good boy we''ll see." But both of your looks promise him, good or bad, both of you want another go as badly as he does.'
 						*nl
-					    'With a laugh Ivan says "I''m always good." Then he quickly finishes dressing and leaves likely late for practice. Once he is gone Katja and you look at each other and giggle, then quickly leaving as well.'
+						'With a laugh Ivan says "I''m always good." Then he quickly finishes dressing and leaves likely late for practice. Once he is gone Katja and you look at each other and giggle, then quickly leaving as well.'
 						act 'Leave': gt 'gschool_grounds', 'main'
 					end
 				end
@@ -254,7 +254,7 @@ if $ARGS[0] = 'Anush_private':
 							'It doesn''t take all that long at all until the waves of pleasure come crashing over you, you are completely lost and number to the outside world for several moments as the orgasm cascades through your body.'
 						end
 						'Just then your smart phone buzzes letting you know the first bell that lunch is over has rung. Anushka pulls the dildo out of your and puts it in her mouth sucking on it, then offers it to you. The two of you quickly suck the dildo clean of all your juices. Then the two of you quickly get dressed, do your best to tidy up and then run hand and hand back to school. Knowing you will be at least a little late, but you really don''t care.'
-						act 'Continue': gt 'gschool_lessons', 'afternoon'
+						act 'Continue': gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -291,7 +291,7 @@ if $ARGS[0] = 'Anush_private2':
 			npc_rel['A156'] -= 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
 			'You pull away and put your hands up to push her gentle away. "Stop I don''t want to right now." The boys snort and mutter shaking there head, while Anushka is a bit more vocal. "What the fuck <<$pcs_nickname>>? I thought you wanted to have some fun, fuck it then, get out if you don''t want to party with us." She gets up and guides you to the door and then out, closing the door loudly once your out. You can hear them talking and you are pretty sure you hear your name.'
-			act 'Continue': gt 'gschool_lessons', 'afternoon'
+			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
 
 		act 'Return the kiss': gt 'gschool_sex', 'Anush_kiss'
@@ -324,7 +324,7 @@ if $ARGS[0] = 'Anush_private2':
 				'You pull away and put your hands up to push her gentle away. "Stop I don''t want to right now." The boys snort and mutter shaking there head, while Anushka is a bit more vocal. "What the fuck <<$pcs_nickname>>? I thought you wanted to have some fun." She turns and starts kissing Valentin, soon all three of them are making out.'
 				*nl
 				'It doesn''t take long until she is on her knee''s sucking them both off, shortly followed by the boys fucking her, it is pretty clear you are not invited to take part. Unsure what else to do, you simple sit there waiting until they finish and wondering how badly you fucked up. Once they finish, with out a word the three of them head out talking to each other and ignoring you. You know you got some work to do with them to repair your relationship with them, that is if you even want to.'
-				act 'Continue': gt 'gschool_lessons', 'afternoon'
+				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end
 
 			act 'Return the kiss': gt 'gschool_sex', 'Anush_kiss'
@@ -351,7 +351,7 @@ if $ARGS[0] = 'Anush_private2':
 				'You pull away and put your hands up to push her gentle away. "Stop I don''t want to right now." The boys snort and mutter shaking there head, while Anushka is a bit more vocal. "What the fuck <<$pcs_nickname>>? I thought you wanted to have some fun." She turns and starts kissing Valentin, soon all three of them are making out.'
 				*nl
 				'It doesn''t take long until she is on her knee''s sucking them both off, shortly followed by the boys fucking her, it is pretty clear you are not invited to take part. Unsure what else to do, you simple sit there waiting until they finish and wondering how badly you fucked up. Once they finish, with out a word the three of them head out talking to each other and ignoring you. You know you got some work to do with them to repair your relationship with them, that is if you even want to.'
-				act 'Continue': gt 'gschool_lessons', 'afternoon'
+				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end
 
 			act 'Return the kiss': gt 'gschool_sex', 'Anush_kiss'
@@ -426,7 +426,7 @@ if $ARGS[0] = 'Anush_kiss':
 							$orgasm_txt = ''
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Continue': gt 'gschool_lessons', 'afternoon'
+							act 'Continue': gt 'gschool_lessons', 'short_break'
 						end
 					end
 				end
@@ -470,7 +470,7 @@ if $ARGS[0] = 'rand_bj':
 						gs 'dinsex','sexcum'
 						gs 'stat'
 						gs 'underwear', 'wear'
-						act 'Continue': gt 'gschool_lessons', 'afternoon'
+						act 'Continue': gt 'gschool_lessons', 'short_break'
 					end
 				end
 			else
@@ -484,7 +484,7 @@ if $ARGS[0] = 'rand_bj':
 					gs 'dinsex','vaginal_sex',10
 					gs 'dinsex','sexcum'
 					gs 'stat'
-					act 'Continue': gt 'gschool_lessons', 'afternoon'
+					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -525,7 +525,7 @@ if $ARGS[0] = 'rand_sex':
 				''
 				'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', 'afternoon'
+				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end
 		end
 		act 'He fucks your ass':
@@ -562,7 +562,7 @@ if $ARGS[0] = 'rand_sex':
 					'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 'arousal', 'anal', 10, 'unknown'
-					act 'Continue': gt 'gschool_lessons', 'afternoon'
+					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -594,7 +594,7 @@ if $ARGS[0] = 'lunch_bj':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Continue': gt 'gschool_lessons', 'afternoon'
+			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
 	end
 end
@@ -655,7 +655,7 @@ if $ARGS[0] = 'lunch_sex2':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Continue': gt 'gschool_lessons', 'afternoon'
+	act 'Continue': gt 'gschool_lessons', 'short_break'
 end
 
 --- gschool_sex ---------------------------------

+ 2 - 2
locations/izdevat

@@ -7,7 +7,7 @@ if grupTipe[numnpc] = 5 and pav_slut < 50:
 		gs 'stat'
 		'You mocked the school outcast, as the other students laugh at them.'
 
-		if $loc ! 'gdkin':gs 'gschool_lessons','short break'
+		if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
 		if $loc = 'gdkin':act 'Move away':gt $loc, $metka
 	end
 elseif grupTipe[numnpc] = 5 and pav_slut >= 50:
@@ -17,7 +17,7 @@ elseif grupTipe[numnpc] = 5 and pav_slut >= 50:
 		gs 'stat'
 		'You began to mock them, but <<$npc_firstname[$static_num]>> answered you. "You''re one to talk cocksucker, everyone knows your the easiest fuck in town." Everyone started laughing at you. You were shocked and confused by everyone turning on you, you hurry away as the others start to talk about you.'
 
-		if $loc ! 'gdkin':gs 'gschool_lessons','short break'
+		if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
 		if $loc = 'gdkin':act 'Move away':gt $loc, $metka
 	end
 end

+ 4 - 4
locations/katjaEv

@@ -471,7 +471,7 @@ if $ARGS[0] = 'kiss_events':
 		if $loc = 'gdkin':
 			act 'Return to dance': gt 'gdkin'
 		else
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	elseif flag_start_parc = 1:
 		flag_start_parc += 1 
@@ -485,7 +485,7 @@ if $ARGS[0] = 'kiss_events':
 		if $loc = 'gdkin':
 			act 'Return to dance': gt 'gdkin'
 		else
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	elseif flag_start_parc >= 2:
 		'While you kissed Katja, someone came nearby sighed loudly, probably, appreciating the view.'
@@ -519,7 +519,7 @@ if $ARGS[0] = 'moron':
 				act 'Return to dance': gt 'gdkin'
 			else
 				'Just as you, kissed the last boy, you turned around to see how Katja was doing with her kissing, but then the bell rang, and you all rushed to class.'
-				gs 'gschool_lessons','short break'
+				gt 'gschool_lessons', 'short_break'
 			end
 		end	
 	end
@@ -554,7 +554,7 @@ if $ARGS[0] = 'moron':
 				if $loc = 'gdkin':
 					act 'Return to dance': gt 'gdkin'
 				else
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end	

+ 6 - 6
locations/katja_sex

@@ -205,7 +205,7 @@ if $ARGS[0] = 'prohorov_sex':
 											'<center><img <<$set_imgh>> src="images/pc/glare.jpg"></center>'
 											'You push Ivan''s hands away and turn your head to give him a dirty look. "Just watch!" You notice his crest fallen look as you turn back to Katja you notice her disappointed expression as well.'
 											'Before you can say anything to make it better the bell rings and all three of you rush to class. While you are putting your shirt back on, you hear Ivan shout. "That was great girls!"'
-											gs 'gschool_lessons','short break'
+											gt 'gschool_lessons', 'short_break'
 										end
 										act 'Encourage Ivan':
 											cls
@@ -218,27 +218,27 @@ if $ARGS[0] = 'prohorov_sex':
 											'A few moments later the class bell rings, you all break apart, as you and Katja start to get dressed Ivan says in a pleading tone. "Meet me after school, so we can continue this?"'
 											'You look at Ivan for a moment and bite your lower lip considering, turning to look at Katja, you find her looking at you and enthusiastically nodding, you can''t help but grin at her eagerness and nod as well. Grinning and looking into each others eyes a moment of complete understanding passes between you.'
 											'Then Katja looks at Ivan and says in a seductive tone. "Meet us here after school and we''ll rock your world." You watch as Ivan has the biggest grin on his face you have every seen. You turn to Katja and both of you laugh, as all three of you rush to class.'
-											gs 'gschool_lessons','short break'
+											gt 'gschool_lessons', 'short_break'
 										end
 									end
 								else
 									'Before you can do more the bell rings and all three of you rush to class. While you put your shirt back on, you hear Ivan shout. "That was great girls!"'
-									gs 'gschool_lessons','short break'								
+									gt 'gschool_lessons', 'short_break'								
 								end
 							end
 						else
 							'Before you can do more the bell rings and all three of you rush to class. While you put your shirt back on, you hear Ivan shout. "That was great girls!"'
-							gs 'gschool_lessons','short break'
+							gt 'gschool_lessons', 'short_break'
 						end
 					end
 				else
 					'Before you can do more the bell rings and all three of you rush to class. While you put your shirt back on, you hear Ivan shout. "That was great girls!"'
-					gs 'gschool_lessons','short break'
+					gt 'gschool_lessons', 'short_break'
 				end
 			end
 		else
 			'Before you can do more the bell rings and all three of you rush to class. While you put your shirt back on, you hear Ivan shout. "That was great girls!"'
-			gs 'gschool_lessons','short break'
+			gt 'gschool_lessons', 'short_break'
 		end
 	end
 end		

+ 3 - 3
locations/kotovtalker

@@ -86,7 +86,7 @@ if numnpc = 9 and pav_slut < 25 and kotovLoveQW >= 0 and (npc_rel[$static_num] >
 		end
 	else
 		'<<$npc_firstname[$static_num]>> "Hey <<$pcs_nickname>>, I''m busy. I''ll catch up with you later." He says as he turns back to talk to his friends.'
-		gs 'gschool_lessons','short break'
+		gt 'gschool_lessons', 'short_break'
 	end
 elseif kotovLoveQW > 0 and pav_slut >= 25:
 	'Vitek scowled and tells you "Well <<$pcs_nickname>>, whats this garbage I hear about what you and <<$gnikname>> did? The whole town already knows, the guys have been telling me all about it. You fucking bitch! "'
@@ -98,7 +98,7 @@ elseif kotovLoveQW > 0 and pav_slut >= 25:
 		gs 'stat'
 		'You started yelling at Vitek that he has fucked other girls. Vitek started yelling at you and suddenly, there is a ringing in your head, your vision is blurry. You find you''re on the floor, with Vitek standing over you. Your cheek burns with pain, it takes you a few moments to understand what happened, it seems he slapped you, so hard it knocked you off your feet. "Stay away from me you fucking whore, it''s over between us!"'
 
-		if $loc = 'gschool_lunch':gs 'gschool_lessons','short break'
+		if $loc = 'gschool_lunch':gt 'gschool_lessons', 'short_break'
 		if $loc = 'gdkin':act 'Move away':gt $loc, $metka
 	end
 
@@ -111,7 +111,7 @@ elseif kotovLoveQW > 0 and pav_slut >= 25:
 			gs 'stat'
 			'It takes a bit but you convince Vitek that all this was just gossip and none of it was true. Vitek frowned, "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry, baby I will shut their yapping mouths."'
 
-			if $loc = 'gschool_lunch':gs 'gschool_lessons','short break'
+			if $loc = 'gschool_lunch':gt 'gschool_lessons', 'short_break'
 			if $loc = 'gdkin':act 'Move away':gt $loc, $metka
 		end
 	end

+ 2 - 2
locations/nogorslut

@@ -56,7 +56,7 @@ if pav_slut <= 50:
 					'He gives you a one armed hug. "<<$pcs_nickname>> your the best, not only are you smoking hot but you are a super cool chick too. If you want to hang out some time you can stop by my place." He pauses a moment and then looks around and leans in close. "Or if you get a little bored during lunch break, you can let me know too." He says with a suggestive tone and waggled eyebrows.'
 					
 					'You laugh at his silly antics, it is nice to have found a fun guy to hang out with, perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
-					if $loc ! 'gdkin':gs 'gschool_lessons','short break'
+					if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
 					if $loc = 'gdkin':act 'Move away':gt $loc, $metka
 					if $loc ! 'gdkin':act 'Tell him you''re bored':gt 'gdksport', 'Ivan_bored'
 				end
@@ -68,7 +68,7 @@ if pav_slut <= 50:
 					if rand(0,4) = 0:
 						'You start to talk to Ivan when he leans in closes and whispers in your ear. "Tell me you''re bored <<$pcs_nickname>>."'
 						act 'Go with him':gt 'gdksport', 'Ivan_bored'
-						gs 'gschool_lessons','short break'
+						gt 'gschool_lessons', 'short_break'
 					else
 						act 'Tell him you''re bored':gt 'gdksport', 'Ivan_bored'
 					end

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است