Explorar el Código

Merge branch 'master' of http://git.tfgamessite.com/KevinSmarts/girllife-ecv

Malen hace 7 años
padre
commit
c218a43c41

+ 1 - 1
locations/NikoDates

@@ -81,7 +81,7 @@ if $ARGS[0] =  'Date 1_1':
 							gs'stat'
 							'<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/sad1.jpg"></center>'
-							'You giggle before replying, "I want you to take this then go and ride on that kiddie ride over there." You hand him the plastic gnome that you won then point to the kiddie ride across from you. Niko lowers his sunglasses, as he replies, "I guess a deal is a deal." and he heads for the ride then sits down on the ride while you walk up in front of him, and take a photo of him on your phone. After he finishes his ride, he hands you back your gnome. "Well you beat me, I hope you will take pitty on your servant, and let me take you to that boxing game, over yonder."'
+							'You giggle before replying, "I want you to take this then go and ride on that kiddie ride over there." You hand him the plastic gnome that you won then point to the kiddie ride across from you. Niko lowers his sunglasses, as he replies, "I guess a deal is a deal." and he heads for the ride then sits down on the ride while you walk up in front of him, and take a photo of him on your phone. After he finishes his ride, he hands you back your gnome. "Well you beat me, I hope you will take pity on your servant, and let me take you to that boxing game, over yonder."'
 							*nl
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/1/winner.jpg"></center>'
 

+ 2 - 2
locations/NikoEv

@@ -31,7 +31,7 @@ if $ARGS[0] = 'Intro':
 		gs'stat'
 		'<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/smile1.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.'	
+		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed, 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_grounds', 'main'
 	end	
@@ -176,7 +176,7 @@ if $ARGS[0] = 'Lunch Chat':
 			gs'stat'
 			'<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/smile'+rand(2,3)+'.jpg"></center>'
-			'You walk up to Niko, and place your hand on his crotch, "I know that I already payed you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack, as you both head toward the less used restroom.'	
+			'You walk up to Niko, and place your hand on his crotch, "I know that I already paid you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack, as you both head toward the less used restroom.'	
 
 			act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
 		end

+ 3 - 3
locations/ParChurch

@@ -199,14 +199,14 @@ if $ARGS[0] = 'pray':
 		moral += 1
 		minut += rand(30,60)
 		'You decide to pray. The beauty and glory of being in the body of God overwhelms you and you lose yourself in prayer. You are unsure of how much time has past when you finally become aware of your surroundings again, but it doesn''t matter as you are at peace with God and the world.'
-	elseif hour >= 20 or hour <= 6 and moral < 30:
+	elseif (hour >= 20 or hour <= 6) and moral < 30:
 		pcs_horny -= 40
 		pcs_mood += 50
 		moral += 1 
 		minut += (60 - randtime)
 		'The Nave is lit only with candles and small presence lights and the darkness gives you some weird vibes. You get the urge to pray very intensely. Before you knew it, an hour went by and you feel a bit reborn.'
 		'"That felt refreshing," you mumble to yourself.'
-	elseif hour >= 20 or hour <= 6 and moral >= 30 and moral < 60:
+	elseif (hour >= 20 or hour <= 6) and moral >= 30 and moral < 60:
 		pcs_horny = 0
 		pcs_mood += 50
 		moral += 1 
@@ -215,7 +215,7 @@ if $ARGS[0] = 'pray':
 		if nark > 1: nark = nark/2
 		'The Nave is lit only with candles and small presence lights and the darkness feels very comforting. You get the urge to pray very intensely. Before you knew it, an hour went by and you feel a bit reborn and cleansed.'
 		'"That felt refreshing," you mumble to yourself.'
-	elseif hour >= 20 or hour <= 6 and moral >= 60 and rand(1,100) > 90:
+	elseif (hour >= 20 or hour <= 6) and moral >= 60 and rand(1,100) > 90:
 		pcs_horny = 50
 		orgasm += 1
 		pcs_mood = 100

+ 16 - 16
locations/_attributes_uniform

@@ -237,35 +237,35 @@ elseif ARGS[1] = 33:
 	CloTopCut = 1
 	CloExhibit = 15
 	CloSkirtShortness = 3
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloExhibit = 20
 	CloSkirtShortness = 4
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloExhibit = 30
 	CloSkirtShortness = 4
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 36:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloExhibit = 30
 	CloSkirtShortness = 4
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 37:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloExhibit = 20
 	CloSkirtShortness = 4
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 5
@@ -274,7 +274,7 @@ elseif ARGS[1] = 38:
 	CloPantsShortness = 6
 	CloBra = 1
 	CloPanties = 1
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 4
@@ -288,7 +288,7 @@ elseif ARGS[1] = 40:
 	CloTopCut = 1
 	CloExhibit = 0
 	CloSkirtShortness = 3
-	CloStyle2 = 3
+	CloStyle2 = 2
 elseif ARGS[1] = 41:
 	CloQuality = 3
 	CloThinness = 6
@@ -298,14 +298,14 @@ elseif ARGS[1] = 41:
 	CloBimbo = 1
 	CloBra = 2
 	CloPanties = 1
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 42:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 3
 	CloExhibit = 20
 	CloSkirtShortness = 4
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 43:
 	CloQuality = 5
 	CloThinness = 5
@@ -313,49 +313,49 @@ elseif ARGS[1] = 43:
 	CloExhibit = 35
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloExhibit = 25
 	CloSkirtShortness = 5
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 45:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloExhibit = 25
 	CloSkirtShortness = 5
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloExhibit = 0
 	CloSkirtShortness = 3
-	CloStyle2 = 3
+	CloStyle2 = 2
 elseif ARGS[1] = 47:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloExhibit = 20
 	CloSkirtShortness = 4
-	CloStyle2 = 3
+	CloStyle2 = 2
 elseif ARGS[1] = 48:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloExhibit = 15
 	CloSkirtShortness = 4
-	CloStyle2 = 3
+	CloStyle2 = 1
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloExhibit = 20
 	CloSkirtShortness = 4
-	CloStyle2 = 3
+	CloStyle2 = 2
 end
 
 --- $attributes_uniform ---------------------------------

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 836 - 453
locations/anushapt


+ 75 - 20
locations/anushka

@@ -231,28 +231,40 @@ if $ARGS[0] = 'wedgie fight':
 	*nl
 	'"Just what are the two of you doing?" Then he holds up his hand. "I don''t care, both of you come with me. The rest of you behave until I get back." He then grabs both you and Anushka by the arms and drags both of you out of detention and to the principals office.'
 	act 'In trouble':
+		*clr
+		cla
 		'<center><b><font color="maroon">Principal''s Office</font></b></center>'
 		'<center><img src="images/characters/pavlovsk/school/head/50.jpg"></center>'
 		'He knocks and when he hears "Enter" he drags you both in. Once inside he lets go of both of you and addresses the school principal. "These two where trying to pull each others clothes off in the middle of the library."'
 		'The principal doesn''t seem remotely surprised by this. "Miss Konstantinov, I have come to expect this kind of behavior from you, but you miss <<$pcs_lastname>> I had hoped would know better, but it seems my hope was in vain." she nods to the teacher. "I will deal with them." With that he leaves the office and closes the door.'
 		act 'Punishment':
+			*clr
+			cla
 			exhibition_exp += 3
 			'<center><img src="images/locations/pavlovsk/school/detention/ffspank1.jpg"></center>'
 			'"Very well since you both wanted to be naked so badly, take off your clothes." She says as the pulls a chair over near her leather couch. She takes a seat on the chair, Anushka quickly takes off all her clothes seeming not to care in the slightest. You are a little slower but finally remove all of your clothes as well. Once you are stark naked, Miss Volkov motions you over. When you are in arms reach she grabs you and pulls you across her lap. She proceeds to spank your bare ass until it is cherry red and stinging like crazy while Anushka takes a seat on the couch and just watches you get spanked.'
 			act 'Next':
+				*clr
+				cla
 				'<center><img src="images/locations/pavlovsk/school/detention/ffspank2.jpg"></center>'
 				'Once she is content, she pulls you up and points to the corner of her office. "Go stand over there and leave your clothes where they are, face the corner." You do as you are told, rubbing your ass as you go. You glance back when you hear the slapping of flesh on flesh and see it is Anushka''s turn. Laid across Miss Volkov''s lap, getting her ass spanked now. Some time passes, Anushka moans and either pretends to like or really does like it. Miss Volkov seems annoyed and spends more time spanking her, than she did you. Finally she tires of it and lifts Anushka off her lap and points to the same corner. "Go join you friend."'
 				act 'Standing':
+					*clr
+					cla
 					'<center><img src="images/locations/pavlovsk/school/detention/ffspank3.jpg"></center>'
 					'Anushka and you stand facing the corner, your ass is stinging and if anything Anushka''s butt is redder than yours. Miss Volkov keeps a eye on you for awhile. Apparently expecting one of you to disobey her, but neither of you do. You quietly stand naked facing the corner.'
 					act 'Rebel':
+						*clr
+						cla
 						'<center><img src="images/locations/pavlovsk/school/detention/ffspank4.jpg"></center>'
 						'After some time Miss Volkov either loses interest in the two of you or forgets about the two naked teenage girls standing in her office. Either way she stops paying attention to the two of you. Some time later Anushka grins at you and then leans over like she is going to say something. When you lean over a bit she kisses you instead, it is a soft but passionate kiss quick kiss. A couple of hours later, Miss Volkov finally speaks to you again. "Alright you two, get dressed and go home. I don''t want to see you in here again."'
 						*nl
 						'With that you gather up your clothes and get dressed again. As the two of you head out, Anushka asks you. "Hey <<$pcs_nickname>>, you want to come by my place?"'
 						act 'Sure':
+							cla
 							'The two of you walk back to the apartment complex and to her building. You go up to the fourth floor where she leads you into her families apartment and takes you into the living room.'
 							act 'Continue':
+								cla
 								if anushkaFirstvisit = 0:
 									gt 'anushapt', 'living'
 								else
@@ -262,6 +274,7 @@ if $ARGS[0] = 'wedgie fight':
 							!!first time you go it goes to this. gt 'anushapt', 'living' After that just have it go straight to Anushka''s room please.
 						end
 						act 'Can''t':
+							cla
 							'You shake your head. "Sorry I can''t I have things I need to do, maybe some other time." Anushka shrugs, "Sure what ever."'
 							act 'leave': gt 'gschool_grounds', 'main'
 						end
@@ -275,23 +288,29 @@ end
 if $ARGS[0] = 'temptation':
 	cls
 	gs 'arousal', 'voyeur', 5
-	minut += 120 - minut
+	minut += 60
 	gs 'stat'
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/locations/pavlovsk/school/detention/detflash.gif"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice Anushka has snuck off into the book stacks, you can just barely see her between the books and the row above. Once she catches you looking she pulls up her shirt and flashes you her boobs, quickly followed by her motioning you over.'
 	act 'Can''t risk it':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/detention.jpg"></center>'
 		'You look around and consider it but then decided it is to risky. When she looks back over you shake your head no, you can tell she is disappointed and soon disappears somewhere among the book stacks. The rest of detention passes very slowly, you don''t see her for the rest of the detention.'
 		act 'Go home':minut += 15 & gt 'gschool_grounds', 'main'
 	end
 	act 'Might be fun':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/characters/pavlovsk/school/head/45.jpg"></center>'
 		'You look around and when you are sure no one is watching, you quickly get up and slip behind one of the shelves. You make your way over to where you saw Anushka, as you get close you spot her much further back in the library waving you on. You follow her to near the very back of the library away from where everyone else is. She gives you a grin that you are all too aware of means trouble. "<<$nickname>> lets have some fun."'
 		act 'What kind of fun?':
+			*clr
+			cla
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/getnaked.jpg"></center>'
 			'Her playfulness and tone just makes you nervous. "What kind of fun?" You say as you glance back in the direction you came from to make sure no ones is coming.'
@@ -301,6 +320,8 @@ if $ARGS[0] = 'temptation':
 			*nl
 			'As you just stand there lost in your own thought, she decides to clear things up a bit. "Come on, havn''t you ever wanted to run around the school naked before? It''s thrilling knowing you could be caught at any time." Yep she sounds like she has done this before and she is right, it would be easy to get caught, but she is also right it might be thrilling.'
 			act 'No I don''t think so':
+				*clr
+				cla
 				npc_rel['A144'] -= 5
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/getnaked.jpg"></center>'
@@ -311,6 +332,8 @@ if $ARGS[0] = 'temptation':
 			end
 			if pcs_exhibition >= 20 and pcs_exhibition < 30:
 				act 'I would like to but...':
+					*clr
+					cla
 !!This is a option if exhibition is 20 but less than 30. I figure with someone else already naked and encouraging Sveta she could do it due to peer pressure even if her exhibition is not normally high enough.
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/getnaked.jpg"></center>'
@@ -322,6 +345,8 @@ if $ARGS[0] = 'temptation':
 			end
 			if pcs_exhibition >= 30:
 				act 'Get Naked':
+					*clr
+					cla
 !!this option shows up if Sveta has a exhibition of 30+
 					npc_rel['A144'] += 3
 					exhibition_exp += 2
@@ -329,6 +354,8 @@ if $ARGS[0] = 'temptation':
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/getnaked2.jpg"></center>'
 					'As you strip off your clothes she says. "That''s the spirit, I knew you were fun." Stepping out of her shorts and panties. Once you are both completely naked she gathers up all the clothes and stuffs them behind some books on the bottom row of books. She gives your naked body a once over before heading towards the side door of the library. "Come on we have to go out this way."'
 					act 'Into the halls':
+						*clr
+						cla
 						exhibition_exp += 3
 						'<center><b><font color="maroon">Halls</font></b></center>'
 						'<center><img src="images/characters/pavlovsk/school/girl/anushka/halls.jpg"></center>'
@@ -337,12 +364,16 @@ if $ARGS[0] = 'temptation':
 						'"Shit the janitor is buffing the floors already." Anushka says as she looks around.'
 						'You cover yourself up and get ready to make a run for it, when Anushka grabs your hand and pulls you into one of the classrooms.'
 						act 'Cornered':
+							*clr
+							cla
 							'<center><b><font color="maroon">Classroom</font></b></center>'
 							'<center><img src="images/characters/pavlovsk/school/girl/anushka/hiding.jpg"></center>'
 							'You quickly duck into a classroom pulling the door closed behind you, you can still hear the janitor slowly getting closer as he polishes the floors. Anuska leads you back into the corner of the class room, where someone would need to come all the way in to see you. She pulls a poster off the wall and lays it on the ground, before sitting down it.'
 							*nl
 							'Not having much of a choice, with no where else to go, you sit down next to her. You notice she seems to be completely comfortable being naked, while you find yourself unconsciously using your hands to cover up. She pulls a joint out from behind her ear and lights it with a single match that was stuck in the end of the joint. When she notes your look of where it came from. "I knew we were going to be running around naked and I wanted to bring it. So I prepared." She takes a long drag off the joint and then offers it to you.'
 							act 'Smoke the joint with her':
+								*clr
+								cla
 								npc_rel['A144'] += 2
 								'<center><b><font color="maroon">Classroom</font></b></center>'
 								'<center><img src="images/characters/pavlovsk/school/girl/anushka/weed.jpg"></center>'
@@ -351,6 +382,8 @@ if $ARGS[0] = 'temptation':
 								!!LillianL-Set anushLimitedQuestions so that Sveta gets 4 questions while waiting for the janitor.
 							end
 							act 'Decline':
+								*clr
+								cla
 								'<center><b><font color="maroon">Detention</font></b></center>'
 								'<center><img src="images/characters/pavlovsk/school/girl/anushka/hiding.jpg"></center>'
 								'Shaking your head no. "No thanks, I am paranoid enough about getting caught without adding to it." She snorts in mild amusement at your answer and just smokes it herself. While the two of you make small talk, you hear the machine getting steadily closer.'
@@ -366,13 +399,15 @@ end
 
 if $ARGS[0] = 'chatWhileWaiting':
 !!once the conversation starts it will repeat 4 times, meaning each act you select lets you select from the same list of acts. Letting Sveta ask about 4 different things, once that is done it will trigger the act 'You hear that?'
-	cls
-	!!LillianL-Maybe a picture to show when landing here?
+	*clr
+	cla
+	'<center><img src="images/characters/pavlovsk/school/girl/anushka/hiding.jpg"></center>'
 	'You''re waiting for the janitor to pass.'	
 	if anushLimitedQuestions > 0 and anushTalkedofDolls = 0:
 !!this will only be a option until it is asked, once you ask about her clothes once it doesn''t come back up. Maybe some code Anushka told location of Dolls and once activated this never shows up again.	
 		act 'Make small talk':
-			cls
+			*clr
+			cla
 			anushLimitedQuestions -= 1
 			anushTalkedofDolls = 1
 			'<center><b><font color="maroon">Classroom</font></b></center>'
@@ -385,6 +420,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 			end
 			'The two of you chat about a variety of things, mostly school, music, clothes, and what has been going on in Pavlovsk lately.'
 			act 'Ask where she buys her clothes':
+				*clr
+				cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				if rand(0,1) = 0:
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/weed.jpg"></center>'
@@ -403,7 +440,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 	end
 	if anushLimitedQuestions > 0:
 		act 'Ask about her reputation':
-			cls
+			*clr
+			cla
 			anushLimitedQuestions -= 1
 			'<center><b><font color="maroon">Classroom</font></b></center>'
 			if rand(0,1) = 0:
@@ -421,7 +459,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 	end
 	if anushLimitedQuestions > 0:
 		act 'Ask about her getting naked':
-			cls
+			*clr
+			cla
 			anushLimitedQuestions -= 1
 			'<center><b><font color="maroon">Classroom</font></b></center>'
 			if rand(0,1) = 0:
@@ -437,7 +476,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 	end
 	if anushLimitedQuestions > 0:
 		act 'Ask about the band':
-			cls
+			*clr
+			cla
 			anushLimitedQuestions -= 1
 			npc_rel['A144'] += 3
 			'<center><b><font color="maroon">Classroom</font></b></center>'
@@ -468,7 +508,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 	if anushLimitedQuestions > 0:
 		!!LillianL-Boyfriend question is asked at the apartment too, maybe flag to avoid asking it twice?
 		act 'Ask if she has a boyfriend':
-			cls
+			*clr
+			cla
 			anushLimitedQuestions -= 1
 			'<center><b><font color="maroon">Classroom</font></b></center>'
 			if rand(0,1) = 0:
@@ -481,7 +522,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 			'Shaking her head no. "Nope, not really looking. I am young and carefree. I plan to as they say sow my wild oats while I can. I am not against the idea mind you, if that right person came along and just blew me away, then I would likely consider it anyways." She pauses a moment and then gives you a wicked grin. "Why do you ask? You wanting to fill that [i]slot?[/i]"'
 			'The way she says it makes you blush a little. She leaves no doubt what slot she means and she makes it sound so dirty and exciting at the same time. But did you mean that?'
 			act 'Maybe':
-				cls
+				*clr
+				cla
 				npc_rel['A144'] += 3
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/scnakiss.jpg"></center>'
@@ -492,7 +534,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 				act 'Talk about something else': gt 'anushka', 'chatWhileWaiting'
 			end
 			act 'No':
-				cls
+				*clr
+				cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/hiding.jpg"></center>'
 				'You shake your head, this conversation really went off the rails and not at all what you meant. "No. I mean I like you, but not like that, not that-" She reaches up and places a finger over your lips to stop you from going on and seems amused by your response.'
@@ -500,7 +543,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 				act 'Talk about something else': gt 'anushka', 'chatWhileWaiting'
 			end
 			act 'I have a boyfriend':
-				cls
+				*clr
+				cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				if rand(0,1) = 0:
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/weed.jpg"></center>'
@@ -520,7 +564,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 				'Anushka looks at you a long moment like she is internally debating something. "Hey if you like him great, but... just be careful around him ok. He isn''t always what he seems."'
 				'Then she smiles and before you can ask what she meant by that she asks. "Hmm think he would be up for a threesome?" She says as she makes a kissy face at you.'
 				act 'No':
-					cls
+					*clr
+					cla
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					if rand(0,1) = 0:
 						'<center><img src="images/characters/pavlovsk/school/girl/anushka/weed.jpg"></center>'
@@ -533,7 +578,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 					act 'Talk about something else': gt 'anushka', 'chatWhileWaiting'
 				end
 				act 'Maybe':
-					cls
+					*clr
+					cla
 					npc_rel['A144'] += 2
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					if rand(0,1) = 0:
@@ -551,7 +597,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 	end
 	if anushLimitedQuestions > 0 and anushAskedofAlyona = 0:
 		act 'Ask about Alyona':
-			cls
+			*clr
+			cla
 			anushLimitedQuestions -= 1
 			anushAskedofAlyona = 1
 			!!LillianL-Made up variable anushAskedofAlyona to track if Sveta asked about this before.			
@@ -569,7 +616,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 			'She looks at you a moment and then softens a bit. "She''s has a fucked up life, more fucked up than anyone I know. She is dealing and getting by well enough considering."'
 			act 'Let it drop': gt 'anushka', 'chatWhileWaiting'
 			act 'Is it that bad?':
-				cls
+				*clr
+				cla
 				npc_rel['A144'] -= 2
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/weed.jpg"></center>'
@@ -582,7 +630,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 	end
 	if anushLimitedQuestions > 0 and anushAskedGrad = 0:
 		act 'Ask what she plans to do after graduation':
-			cls
+			*clr
+			cla
 			anushLimitedQuestions -= 1
 			anushAskedGrad = 1
 			!!LillianL-Made up variable anushAskedGrad to track if Sveta asked about this before.	
@@ -599,7 +648,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 			'You are a bit surprised, you always heard she was doing bad like all the gopniks. "Oh... I didn''t know you were doing that good in school."'
 			'She laughs a bit at that. "Yeah everyone is surprised by that, but I checked what grades I needed to go to the University and I make sure mine stay above that. So yeah, I am a smart bitch as well as a good looking one. What about you?"'
 			act 'I don''t know':
-				cls
+				*clr
+				cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				if rand(0,1) = 0:
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/weed.jpg"></center>'
@@ -613,7 +663,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 				act 'Talk about something else': gt 'anushka', 'chatWhileWaiting'
 			end
 			act 'Go to the University':
-				cls
+				*clr
+				cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				if rand(0,1) = 0:
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/weed.jpg"></center>'
@@ -626,7 +677,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 				act 'Talk about something else': gt 'anushka', 'chatWhileWaiting'
 			end
 			act 'Get married':
-				cls
+				*clr
+				cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				if rand(0,1) = 0:
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/weed.jpg"></center>'
@@ -645,7 +697,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 	if anushLimitedQuestions <= 0:
 	!!This one triggers after the player has picked 4 times above.
 		act 'You hear that?':
-			cls
+			*clr
+			cla
 			exhibition_exp += 3
 			'<center><b><font color="maroon">Classroom</font></b></center>'
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/hallcheck.jpg"></center>'
@@ -656,6 +709,8 @@ if $ARGS[0] = 'chatWhileWaiting':
 			'The two of you quickly make your way back to the library, sneaking back in the way you left. Heading back to where you stashed your clothes, just as you finish dressing. The bell that denotes detention is over rings. She looks at you and smiles. "Perfect timing as always. See you later <<pcs_nickname>>, unless you want to come over?"'
 			'With that the two of you leave school.'
 			act 'Go with Anushka':
+				cla
+				*nl
 				'The two of you walk back to the apartment complex and to her building. You go up to the fourth floor where she leads you into her families apartment and takes you into the living room.'
 				act 'Continue': gt 'anushapt', 'firstvisit'
 			end

+ 17 - 2
locations/body_shape

@@ -433,8 +433,23 @@ if $args[0] = 'basebeautycalc':
 	vneshtemp += supnatvnesh
 
 !!	This is the rate of change limiter
-	if pcs_apprncbase > vneshtemp: pcs_apprncbase -= 1
-	if pcs_apprncbase < vneshtemp: pcs_apprncbase += 1
+	if pcs_apprncbase > vneshtemp:
+		if pcs_apprncbase - 5 > vneshtemp:
+			pcs_apprncbase -= 5
+		elseif pcs_apprncbase - 3 > vneshtemp:
+			pcs_apprncbase -= 3
+		else
+			pcs_apprncbase -= 1
+		end
+	elseif pcs_apprncbase < vneshtemp:
+		if pcs_apprncbase + 5 < vneshtemp:
+			pcs_apprncbase += 5
+		elseif pcs_apprncbase + 3 < vneshtemp:
+			pcs_apprncbase += 3
+		else
+			pcs_apprncbase += 1
+		end
+	end
 
 !!	This is for use when a reset is called for by setting args[1] = 1
 	if args[1] = 1: pcs_apprncbase = vneshtemp

+ 15 - 17
locations/dolls

@@ -57,7 +57,7 @@ if $ARGS[0] = 'start':
 !!here should be a list of clothing you can buy. shoes, jewelry, clothing, piecrings, etc. Just a list of things to buy and click it takes you to a page showing all the items for sale. Like how most shops are done. 
 
 	if doll_staff = 0:
-		if know_Savva = 1: 'As you walk in, Savva waves at you and smiles. "Hi <<$pcs_nickname>>, great to see you again! Let me know if i can help you with anything."'
+		if know_Savva = 1: 'As you walk in, Savva waves at you and smiles. "Hi <<$pcs_nickname>>, great to see you again! Let me know if I can help you with anything."'
 
 		act 'Go to the counter': gt 'dolls', 'savva'
 	else
@@ -132,16 +132,16 @@ if $ARGS[0] = 'dolls_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'dolls',i, 50
 
 if $ARGS[0] = 'savva':		
 	'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/savva.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/savva/savva.jpg"></center>'
 	if know_Savva = 0:
 		'At the counter you see a young man; he looks about your sister''s age but he has a shy, quiet, almost girlish quality about him. As you approach the counter, he quietly asks if you need help, so softly you can barely hear him. "Can I help you?"'
 	else
 		'Savva is working the counter today. As you walk up, he gives you a friendly smile. "Hey <<$pcs_nickname>>, nice to see you again. What can I help you with?"'
 	end
 	act 'Ask him about the shop':
-		npc_rel['A204'] += 5
+		npc_rel['A204'] += 2
 		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/savva.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/savva/savva.jpg"></center>'
 		'You ask him about the shop. He tells you it opened a few years ago and they mostly cater to the college kids. Occasionally they get hassled by the local gopniks or police, but he likes the job. Then asks if you need help finding a outfit.'
 		act 'Continue': gt 'dolls', 'savva'
 		!!act 'Anushka sent me': gt 'dolls', 'Anushka sent me'
@@ -155,16 +155,16 @@ if $ARGS[0] = 'savva':
 !!	end
 	act 'Flirt with him':
 		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/savva.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/savva/savva.jpg"></center>'
 		'You think he is pretty cute in a girlish kinda way, so you chat with him about a variety of things and flirt for all you are worth. He seems happy to talk, especially about fashion and music... but either he''s gay or completely oblivious to your flirting.'
 		act 'Continue': gt 'dolls', 'savva'
 		!!act 'Anushka sent me': gt 'dolls', 'Anushka sent me' !!This only shows up if Anushka has told Sveta about the store.
 	end
 	act 'Chat with him':
 		know_Savva = 1
-		npc_rel['A204'] += 5
+		npc_rel['A204'] += 3
 		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/savva.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/savva/savva.jpg"></center>'
 		'You decide to chat with him. He seems happy to talk with you, especially about fashion and music. You spend some time chatting about a variety of topics.'
 		if npc_rel['A204'] > 50:'As you do, you eventually touch upon his latest date, some "cutest boy he''s ever seen" that he met in the shop some time ago. He seems to have been dying to tell somebody about it because he just gushes about how handsome the young man is and how great the sex was... Next week, he will likely be talking about another one.'
 		act 'Continue': gt 'dolls', 'savva'
@@ -178,16 +178,15 @@ end
 
 if $ARGS[0] = 'viola':
 	'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/viola.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/viola/viola.jpg"></center>'
 	if know_Viola = 0:
-		'At the counter you see a young woman, maybe as old as your sister. She is reading a magazine when you walk up, only glancing up at you as you stop at the counter. "How can I help you?"'
+		'At the counter you see a young woman, maybe as old as your sister or a year or two older. She is reading a magazine when you walk up, only glancing up at you as you stop at the counter. "How can I help you?"'
 	else
 		'"What''s up, <<$pcs_nickname>>? You here to do a little shopping or to kill some time?"'
 	end
 	act 'Ask her about the shop':
-		npc_rel['A205'] += 5
 		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/viola.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/viola/viola.jpg"></center>'
 		'You ask her about the shop. She tells you the place is only a few years old and is about the only place to buy a decent outfit in the whole city; unless you are willing to shop online, that is, which leads her to talking about the woes of online shopping where clothes don''t fit and never seem to have anywhere near as good a quality as they seem to on the pictures. You get the impression that the topic really bothers her and she could go on for some time if you let her.'
 		act 'Continue': gt 'dolls', 'viola'
 		!!act 'Anushka sent me': gt 'dolls', 'Anushka sent me'
@@ -201,23 +200,22 @@ if $ARGS[0] = 'viola':
 !!		act 'Continue': gt 'dolls', 'viola'
 !!	end
 	act 'Flirt with her':
-		npc_rel['A205'] += 10
+		npc_rel['A205'] += 3
 		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/viola.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/viola/viola.jpg"></center>'
 		'As you talk to her, you start flirting and she returns the favor to a point, occasionally touching your hand or shoulder, laughing at some of the things you say... but she never fully commits to flirting with you; either she''s playing hard to get, trying to put you in a good mood to buy stuff, or she is messing with you - you are unsure which one it is.'
 		act 'Continue': gt 'dolls', 'viola'
 	end
 	act 'Chat with her':
 		know_Viola = 1
-		npc_rel['A205'] += 5
+		npc_rel['A205'] += 2
 		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/savva.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/viola/viola.jpg"></center>'
 		'You decide to chat with her and the two of you talk about a variety of topics. She seems happy to talk with you, especially about fashion, techniques on dying your hair, music, and the injustices of life. She mentions how the gopniks hassle some of the gay boys that shop here and some time passes, before you decide to do something else.'
 		act 'Continue': gt 'dolls', 'viola'
 	end
-
 	act 'Return': gt 'dolls', 'start'
 end
-		
+
 --- dolls ---------------------------------
 

+ 153 - 83
locations/gschool_detention

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	elseif i <= 20 and npc_rel['A144'] > 50 and tanga = 1:
 		gt 'gschool_detention', 'Anushka_wedgie'
 	else
-		cls
+		*clr & cla
 		detention_set = 0
 		demerit -= 20
 		grupvalue[3] -= 2
@@ -87,7 +87,7 @@ if $ARGS[0] = 'wedgie':
 		'See the smug look on her face is to much, you slap her hard across her face. She is obviously surprised by the slap as she doesn''t even try to block it. Several of the other students start yelling "Fight, fight!" but before anything more can happen the teacher walks in. "Enough! Just what the hell is going on?"'
 		'You open your mouth to explain but before you can he cuts you off. "Come up here right now." You do as you are told and walk up to him. "I am going to give you a choice. Take my punishment right now or we can go see the principal, your choice."'
 		act 'Go to the principal': gt 'gschool_office', 'detPunishment1'
-		act 'Take the offer': gt 'gschool_detention', 'Take the offer'
+		act 'Take the offer': gt 'gschool_detention', 'offer'
 	end
 	act 'Promise revenge':
 		'<center><b><font color="maroon">Detention</font></b></center>'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'Anushka_wedgie':
 		'See the smug look on her face is to much, you slap her hard across her face. She is obviously surprised by the slap as she doesn''t even try to block it. Several of the other students start yelling "Fight, fight!" but before anything more can happen the teacher walks in. "Enough! Just what the hell is going on?"'
 		'You open your mouth to explain but before you can he cuts you off. "Come up here right now." You do as you are told and walk up to him. "I am going to give you a choice. Take my punishment right now or we can go see the principal, your choice."'
 		act 'Go to the principal': gt 'gschool_office', 'detPunishment1'
-		act 'Take the offer': gt 'gschool_detention', 'Take the offer'
+		act 'Take the offer': gt 'gschool_detention', 'offer'
 	end
 	act 'Promise revenge':
 		'<center><b><font color="maroon">Detention</font></b></center>'
@@ -165,7 +165,9 @@ if $ARGS[0] = 'Anushka_wedgie':
 	end
 end
 
-if $ARGS[0] = 'Sitting':
+if $ARGS[0] = 'sitting':
+	*clr
+	cla
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/locations/pavlovsk/school/detention/detention.jpg"></center>'
 	'Once the teacher is busy ignoring you, you look around a bit and really don''t see anything interesting going on. Looks like you will have to entertain yourself.'
@@ -195,7 +197,7 @@ if $ARGS[0] = 'Sitting':
 		'<center><img src="images/locations/pavlovsk/school/detention/detention.jpg"></center>'
 		'You briefly - very briefly - consider doing homework but the thought alone is enough to bore you. You look around and see no one is looking, so you get up and sneak back into the rows of book shelves.'
 !!this goes to the random roam around events, check my code here.
-		gt 'gschool_detention', 'Roam around':
+		act 'Look around': gt 'gschool_detention', 'Roam around'
 	end
 	act 'bored':
 		cla
@@ -236,76 +238,87 @@ if $ARGS[0] = 'incidental_events':
 end
 		
 if $ARGS[0] = 'upskirt1':
-	cls
-	gs 'arousal', 'voyeur', 5
-	minut += 120 - minut
-	gs 'stat'
+	*clr
+	cla
+	minut += 60
 	gs 'gschool_events', 'rand_teacher_arg'
 !!can be any of the girls from school but a nerd, Veronika, Ekaterina, or Anushka.
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you, after a few minutes she leans back in her chair and relaxes. Spreading her legs slightly as she does, the movement draws your eyes and you are given a eye full. Apparently she forgot her panties today because her pussy is now on full display for any to see, well any from the right vantage point, like yourself.'
+	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'end'
+	gs 'stat'
 	act 'Ignore it':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
 		'You decided it is none of your business and do your best to ignore it. After several minutes one of the boys takes notice and walks over to the table and puts his phone under it and starts taking pictures. She quickly realizes what''s going on and closes her legs together and blushes, soon the two of them are in a heated whisper argument which soon draws the teachers attention. When both feign nothing is wrong and go back to their seats, the teacher keeps a eye on them for a bit before losing interest.'
 		'The rest of detention passes much more quietly with nothing else interesting happening.'
-		act 'Go home':minut += 15 & gt 'gschool_detention', 'end'
+		act 'Go home': gt 'gschool_detention', 'end'
 	end
 	act 'Get her attention and let her know.':
+		*clr
+		cla
 !!if you can code it to raise the random girl in question friendship
 		npc_rel['A<<i>>'] += 3
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
 		'You have to let her know, maybe she is doing it on purpose and maybe not. It takes a bit before you finally get her attention and then mimic closing together with your hands as if they was legs and then gesture towards her. It takes her a moment to realize what you mean, then she blushes slightly and closes her legs, followed by her mouthing thank you to you. You smile and nod back to her. Feeling pretty good about helping a fellow girl out the rest of detention doesn''t seem as bad.'
-		act 'Go home':minut += 15 & gt 'gschool_detention', 'end'
+		act 'Go home': gt 'gschool_detention', 'end'
 	end
 end
 
 if $ARGS[0] = 'upskirt2':
-	cls
-	gs 'arousal', 'voyeur', 5
-	minut += 120 - minut
-	gs 'stat'
+	*clr
+	cla
+	minut += 60
 	gs 'gschool_events', 'rand_teacher_arg'
 !!can be any of the girls from school but a nerd, Veronika, or Anushka.
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/locations/pavlovsk/school/detention/upskirt.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> climbing up the small ladder uses to get to the top shelves of the books. As you watch her climb you quickly realize she is not wearing any panties and is giving everyone watching a clear view of her pussy. Before you can say anything someone whistles, which causes the teacher to start demanding who did it. During the distraction she quickly climbs back down and returns to her seat, blushing slightly but also smiling.'
-	act 'Go home':minut += 15 & gt 'gschool_detention', 'end'
+	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Go home': gt 'gschool_detention', 'end'
 end
 
 if $ARGS[0] = 'flashing girl':
-	cls
-	gs 'arousal', 'voyeur', 5
-	minut += 120 - minut
-	gs 'stat'
+	*clr
+	cla
+	minut += 60
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/locations/pavlovsk/school/detention/detflash1.gif"></center>'
 !!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting in a spot that blocks almost everyones view of her, but yours. She has her phone held in front of her, obviously having a video conversation with someone, then you see her lift her shirt and flash who ever it is on the phone. She laughs a bit apparently at their reaction, the teacher clears his throat at her outburst. She quickly ends the call and spends the rest of the time playing on her phone. After watching her a bit more, you realize she is not going to do anything more so you play on your phone as well, at least there was a little excitement today.'
-	act 'Go home':minut += 15 & gt 'gschool_detention', 'end'
+	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Go home': gt 'gschool_detention', 'end'
 end
 
 if $ARGS[0] = 'teasing girl':
-	cls
-	gs 'arousal', 'voyeur', 5
-	minut += 120 - minut
-	gs 'stat'
+	*clr
+	cla
+	minut += 60
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/locations/pavlovsk/school/detention/tease.jpg"></center>'
 !!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> has snuck off into the book stacks, she is watching some boys watch her, she pulls down her pants and starts to pull down her panties but she stops just before she shows anything, grins as she pulls her clothes back up. After  doing this a few times, each time the boys look hopefully this might be the time, but it never is. Finally she gets bored teasing them and wanders off. After that you start playing on your phone again, at least there was a little excitement today.'
-	act 'Go home':minut += 15 & gt 'gschool_detention', 'end'
+	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Go home': gt 'gschool_detention', 'end'
 end
 
 if $ARGS[0] = 'handjob':
-	cls
-	gs 'arousal', 'voyeur', 10
-	minut += 120 - minut
-	gs 'stat'
+	*clr
+	cla
+	minut += 60
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/locations/pavlovsk/school/detention/sex/handjob.jpg"></center>'
@@ -313,7 +326,10 @@ if $ARGS[0] = 'handjob':
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice a girl, you have seen her around but she is from another grade and you can''t recall her name. She is sitting next to <<$rand_boy>> she has his shorts pulled down in front and is jerking him off under the desk. Both of them do a fairly good job of acting like nothing is going on, but from your seat, you have a perfect view of the action.'
 	*nl
 	'Some time later, she has to switch hands one than once, but he finally leans back and closes his eyes. Sensing he is close she tilts his dick down as she keeps jerking him off and cups her other hand under the head of his dick. Moment later he is shooting his load into her hand, a bit of it shoots out onto the floor as well. Once he finishes she lets go of him and brings her hands up to her face, where she starts to lick all his cum off them, as he tucks his dick away. Not long after they sit side by side playing on their phones, pretending like nothing happened. Soon you start playing on your phone as well, at least there was a little excitement today.'
-	act 'Go home':minut += 15 & gt 'gschool_detention', 'end'
+	gs 'arousal', 'voyeur', 10
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Go home': gt 'gschool_detention', 'end'
 end
 
 	
@@ -325,7 +341,7 @@ end
 !!If gopnik social group random girl is Lena Kotova, Lera Tsarev, Pauline Sebagotulina, Ekaterina "Katyusha" Maksimov, Anushka Konstantinov, Alyona Zima or any girl Sveta has a friendship of 50+
 !!If outcast social group random girl is Sonia or any girl Sveta has a friendship of 50+
 if $ARGS[0] = 'Chat with <<$rand_girl>>':
-	cls
+	*clr & cla
 	!!npc_rel['A?'] += 3
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -342,7 +358,7 @@ end
 !!If gopnik social group random boy is Vitek Kotov, Dan Ryzhov, Vasily Shulgin, Roman Yakovlev, Radomir Popov, Valentin Bogdanov, Arkadi Fyodorov, Nikolai Volkov, Lavrenti Romanov or any boy Sveta has a friendship of 50+
 !!If outcast social group random boy is Lesco Tsarev, Petia Alkaev or any boy Sveta has a friendship of 50+
 if $ARGS[0] = 'Chat with <<$rand_boy>>':
-	cls
+	*clr & cla
 	!!npc_rel['A?'] += 3
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -354,7 +370,7 @@ if $ARGS[0] = 'Chat with <<$rand_boy>>':
 end
 
 if $ARGS[0] = 'Help Friends in need':
-	cls
+	*clr & cla
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
 	:detention_grupmatch
     i = rand(0,47)
@@ -456,7 +472,7 @@ if $ARGS[0] = 'strange':
 			act 'Go home': gt 'gschool_detention', 'end'
 		end
 		act '"Eat me out"':
-			cls
+			*clr & cla
 !!I made this one 5 because Sveta is having sex in a place she could get caught. I know you said 1-3 but having sex in public seems like it should add more. But if you want to lower it go ahead.
 			exhibition_exp += 5
 			pav_sex +=3
@@ -483,7 +499,7 @@ if $ARGS[0] = 'strange':
 !!want to change this to needing dom/will what ever we use in place of dom in the future or being a gopnik, a gopnik bullying a nerd should always be a option.
 				if pcs_dom >= 10: 
 					act 'Glaze his face':
-						cls
+						*clr & cla
 						npc_rel['A152'] -= 5
 						'<center><b><font color="maroon">Detention</font></b></center>'
 						'<center><img src="images/characters/pavlovsk/school/boy/feofan/sex/school/detlick2.jpg"></center>'
@@ -505,7 +521,7 @@ if $ARGS[0] = 'strange':
 					end
 				end
 				act 'Suck his cock':
-					cls
+					*clr & cla
 					gs 'boyStat', 72
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img src="images/characters/pavlovsk/school/boy/feofan/sex/school/detbj.jpg"></center>'
@@ -527,7 +543,7 @@ if $ARGS[0] = 'strange':
 end
 
 if $ARGS[0] = 'pussy_fuck':
-	cls
+	*clr & cla
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/characters/pavlovsk/school/boy/feofan/sex/school/detvag.jpg"></center>'
 	'Your pussy is soaking wet at this point and you are aching to have something inside it. "Come here and fuck me", you command him. He moves over to you at once and slides his <<dick>>cm <<$dick_girth>> dick into your soaking wet pussy in one stroke, a soft groan escaping both of your mouths as he does. You stop him, remind him with a gesture of your finger that you have to keep it down, but when he nods in acknowledgment, you lean back and he starts fucking you deep and hard.'
@@ -543,7 +559,7 @@ if $ARGS[0] = 'pussy_fuck':
 end
 
 if $ARGS[0] = 'ass_fuck':
-	cls
+	*clr & cla
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/characters/pavlovsk/school/boy/feofan/sex/school/detanal.jpg"></center>'
 	'Feeling incredibly turned on, maybe because you are completely in control, maybe because there are several other students and a teacher no more than four or five meters away, or maybe just because you are a naturally horny little bitch. You don''t know and you don''t really care either. All you know is that you want to feel him in your ass now, so you touch his chest again to stop his movement. "Fuck my ass!", comes your order, plain and simple.'
@@ -563,7 +579,7 @@ if $ARGS[0] = 'ass_fuck':
 end
 
 if $ARGS[0] = 'strange_cum':
-	cls
+	*clr & cla
 	npc_rel['A152'] += 5
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/characters/pavlovsk/school/boy/feofan/sex/school/detcum.jpg"></center>'
@@ -585,7 +601,7 @@ if $ARGS[0] = 'company':
 	elseif Marcus_sextype = 2:
 		act 'Enjoy some company': gt 'gschool_detention', 'company2'
 	end
-	cls
+	*clr & cla
 	minut += 180
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -620,7 +636,7 @@ if $ARGS[0] = 'company':
 			act 'Go home': gt 'gschool_detention', 'end'
 		end
 		act '"Yes"':
-			cls
+			*clr & cla
 			npc_rel['A146'] += 5
 			'<center><img src="images/characters/pavlovsk/school/boy/marcus/marcuswalk.jpg"></center>'
 			'You smile to him. "I like you too, Marcus, and I''d love it if you walked me home." He smiles and walks with you. The two of you continue your conversation from earlier, mostly revolving around you. It seems that he wants to know everything about you. The way home takes way longer than usual but you are in no hurry in his company; at one point, he even puts his arm around your shoulders as you walk.'
@@ -637,14 +653,12 @@ if $ARGS[0] = 'company':
 
 			act 'Home':
 				if hour = 8:
-					minut += 180
-				elseif hour = 9:
 					minut += 120
-				elseif hour = 10:
+				elseif hour = 9:
 					minut += 60
 				end
-				gs 'stat'
 				minut += 70 - minut
+				gs 'stat'
 				gt 'pod_ezd', 'etaj_1'
 			end
 		end
@@ -687,7 +701,7 @@ if $ARGS[0] = 'company2':
 		*nl
 		'"Well, we would talk; you know, to kill time", you suggest. He nods and soon the two of you are talking about what he likes about Russia and you have him tell you about what it was like living in America.'
 		act 'After detention':
-			cls
+			*clr & cla
 			gs 'boyStat', 146
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/marcus/sex/school/detmbj.jpg"></center>'
@@ -700,7 +714,7 @@ if $ARGS[0] = 'company2':
 			gs 'arousal', 'bj', 5
 			'But after a few minutes, that isn''t enough anymore and touches your chin. "Stop. Get up and strip naked, then bend over the desk." You do as he tells you, finding this perverted game of Simon Says oddly arousing.'
 			act 'Anal':
-				cls
+				*clr & cla
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img src="images/characters/pavlovsk/school/boy/marcus/sex/school/detmanal.jpg"></center>'
 				'You strip all of your clothes off and bend over the desk. You look back and see him pull a small bottle of lube out of his pocket and lubing his dick up really well, then spreading some of it on your anus as well.'
@@ -712,7 +726,7 @@ if $ARGS[0] = 'company2':
 				gs 'arousal', 'anal', 15
 				gs 'stat'
 				act 'Continue':
-					cls
+					*clr & cla
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img src="images/characters/pavlovsk/school/boy/marcus/sex/school/detmanal1.jpg"></center>'
 					'He fucks your ass doggy style for awhile but then pulls out and rolls you over on the desk. With your legs spread, he puts his <<dick>>cm <<$dick_girth>> cock back into your ass. This time, it slips right in with no pain at all. The only thing you seem to be capable of feeling right now is lust. "Play with your pussy, fingerbang yourself." He tells you as he picks up the pace.'
@@ -755,10 +769,8 @@ if $ARGS[0] = 'company2':
 
 							act 'Home':
 								if hour = 8:
-									minut += 180
-								elseif hour = 9:
 									minut += 120
-								elseif hour = 10:
+								elseif hour = 9:
 									minut += 60
 								end
 								minut += 70 - minut
@@ -815,14 +827,14 @@ if $ARGS[0] = 'Ivanov_suck':
 	gs 'arousal', 'bj', 5
 	gs 'stat'
 	act 'Bend over':
-		cls
+		*clr & cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/characters/pavlovsk/school/teacher/serafim/sex/school/teacherlick.jpg"></center>'
 		'You turn and bend over the table, silently preparing yourself for whatever he has in mind as he pulls your uniform''s skirt up and your panties down. His hands pull your ass cheeks apart and then you feel his tongue against your asshole, wet and warm, the fact that it is his utterly disgusting you. He keeps licking your rosebud, uses his fingers to work his saliva into your anus, then goes back to licking it some more. He does this several times, preparing you for penetration, no doubt, and all you can do is wait in fearful anticipation. Eventually, you hear him rummaging and then something bigger than a finger rubs against your asshole: He rubs the head of his dick around, lining it up.'
 		gs 'arousal', 'rimming', 5
 		gs 'stat'
 		act 'Take his dick up your ass':
-			cls
+			*clr & cla
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/characters/pavlovsk/school/teacher/serafim/sex/school/teacheranal.jpg"></center>'
 			'You were bracing for the push, the feeling of him entering. What you didn''t prepare for was his hard spank on your ass, just before he shoves his <<dick>>cm <<$dick_girth>> cock into you butt, causing you to tense up in surprise. He doesn''t let up, though; Mr Ivanov grabs ahold of your hips and drives himself balls deep inside you. All you can do is cry out in pain, but that is nothing compared to the agony that comes next: He starts hammering into your ass in violent thrusts, your thighs banging hard against the edge of the table. Any residual doubt that he does this deliberately to hurt you are eliminated by his words: "That''s right, whore, scream for me! You''re pain is music to my ears."'
@@ -831,7 +843,8 @@ if $ARGS[0] = 'Ivanov_suck':
 			gs 'arousal', 'anal', 20, 'rough'
 			gs 'stat'
 			act 'Take a facial':
-				cls
+				*clr
+				cla
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img src="images/characters/pavlovsk/school/teacher/serafim/sex/school/teachercum.jpg"></center>'
 				'How long he violates your ass with his <<dick>>cm <<$dick_girth>> cock, you cannot tell, other than through the fact that your thighs have been thrust against the edge of the table so many times that your legs really hurt now and you are sure they are badly bruised. It lasts so long that the pain doesn''t seem to let up but only becomes greater, filling you up like a liquid, and you are oh-so-close to the point where you don''t think you can take it anymore when he finally, finally stops and pulls out. He jerks you back and forces you down on your knees, or at least that''s how he acts - in truth, your legs just give away as soon as you no longer have the table to support yourself on.'
@@ -844,7 +857,8 @@ if $ARGS[0] = 'Ivanov_suck':
 				gs 'cum_call', 'mouth', $boy
 				gs 'stat'
 				act 'Back to detention':
-					cls
+					*clr
+					cla
 					gs 'stat'
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/detention/detention.jpg"></center>'
@@ -878,8 +892,9 @@ if $ARGS[0] = 'Roam around':
 end
 
 if $ARGS[0] = 'Nothing':
-	cls
-	minut += 120 - minut
+	*clr
+	cla
+	minut += 60 - minut
 	gs 'stat'
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -914,12 +929,16 @@ if $ARGS[0] = 'Nothing':
 			'<center><img src="images/locations/pavlovsk/school/detention/detention.jpg"></center>'
 			'You briefly - very briefly - consider doing homework but the thought alone is enough to bore you. You try playing on your phone but after awhile even that gets boring. You sigh and look around the room, most of the other students are just as bored as you and no one is really paying any attention. You notice one of the boys occasionally looking around and you get a wicked idea, flash him. But should you?'
 			act 'No':
+				*clr
+				cla
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img src="images/locations/pavlovsk/school/detention/detention.jpg"></center>'
 				'As tempting as it is, you decided against it. You''re just not that kind of girl, after a bit you give up and starting playing on your phone again.'
 				act 'Go home': gt 'gschool_detention', 'end'
 			end
 			act 'Yes':
+				*clr
+				cla
 				pav_sex +=5
 				exhibition_exp +=5
 				'<center><b><font color="maroon">Detention</font></b></center>'
@@ -930,6 +949,8 @@ if $ARGS[0] = 'Nothing':
 		end
 	end
 	act 'Masturbate':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 		'Bored out of your mind and feeling a bit sexually frustrated you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again, you peek around the corner to make sure no one is near and heard you. Once it is clear you decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -942,8 +963,9 @@ if $ARGS[0] = 'Nothing':
 end
 
 if $ARGS[0] = 'eatout':
-	cls
-	minut += 120 - minut
+	*clr
+	cla
+	minut += 60 - minut
 	gs 'stat'
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -952,12 +974,16 @@ if $ARGS[0] = 'eatout':
 	gs 'arousal', 'voyeur', 20
 	gs 'stat'
 	act 'Keep watching':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/eatout.gif"></center>'
 		'You watch them, he seems to really know what he is doing, she is fighting to keep from screaming out, many minutes go by. Then she starts to spasm, obviously having a orgasm. He keeps it up through her whole orgasm, once it is finally over. She stands up and pulls up her panties, while he starts to unbutton his pants. She says something that leads to a bit of a heated discussion that you can''t quite hear but you think you know what it is about. Finally he gives up and buttons his pants back and they both head back for the front of the library. As she gives him a kiss on the cheek.'
 		gs 'arousal', 'voyeur', 20
 		gs 'stat'
 		act 'Masturbate':
+			*clr
+			cla
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 			'After they leave you are unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -969,6 +995,8 @@ if $ARGS[0] = 'eatout':
 		end
 	end
 	act 'Masturbate':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again, you peek around the corner but the couple is gone. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -981,8 +1009,9 @@ if $ARGS[0] = 'eatout':
 end
 
 if $ARGS[0] = 'finger':
-	cls
-	minut += 120 - minut
+	*clr
+	cla
+	minut += 60 - minut
 	gs 'stat'
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -991,12 +1020,16 @@ if $ARGS[0] = 'finger':
 	gs 'arousal', 'voyeur', 20
 	gs 'stat'
 	act 'Keep watching':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/blowjob.gif"></center>'
 		'You watch them, he seems to really know what he is doing, she is fighting to keep from screaming out, many minutes go by. She pulls her shirt and bra off half way through. After a bit more finger banging from him, she starts to spasm, obviously having a orgasm. He keeps it up through her whole orgasm, once it is finally over. She drops down to her knee''s as he pulls his dick out of his pants, she immediately starts sucking his cock. She bobs her head up and down along the shaft of his cock, sucking it for all she is worth. Finally he grunts, she slows down a bit and uses her hand to help milk his cock. Only once he has finished does she stop sucking his dick. Having obviously swallowed his whole load, they both get dressed and then head back to the front of the library.'
 		gs 'arousal', 'voyeur', 20
 		gs 'stat'
 		act 'Masturbate':
+			*clr
+			cla
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 			'After they leave you are unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1008,6 +1041,8 @@ if $ARGS[0] = 'finger':
 		end
 	end
 	act 'Masturbate':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again, you peek around the corner but the couple is gone. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1020,8 +1055,9 @@ if $ARGS[0] = 'finger':
 end
 
 if $ARGS[0] = 'doggy':
-	cls
-	minut += 120 - minut
+	*clr
+	cla
+	minut += 60 - minut
 	gs 'stat'
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -1030,12 +1066,16 @@ if $ARGS[0] = 'doggy':
 	gs 'arousal', 'voyeur', 20
 	gs 'stat'
 	act 'Keep watching':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/doggy'+rand(1,2)+'.gif"></center>'
 		'You watch them, for a bit and they go at it for some time. She especially seems to really be having the time of her life. She is fighting to keep from screaming out, for several minutes as she starts to spasm, obviously having a orgasm. He keeps it up through her whole orgasm, once it is finally over. He hammers away at her for a few more minutes before pulling out and shooting his load all over her ass. Afterwards they get cleaned up and dressed, exchanging a few quiet words, before heading back to the front of the library.'
 		gs 'arousal', 'voyeur', 20
 		gs 'stat'
 		act 'Masturbate':
+			*clr
+			cla
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 			'After they leave you are unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1047,6 +1087,8 @@ if $ARGS[0] = 'doggy':
 		end
 	end
 	act 'Masturbate':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again, you peek around the corner but the couple is gone. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1059,8 +1101,9 @@ if $ARGS[0] = 'doggy':
 end
 
 if $ARGS[0] = 'couple':
-	cls
-	minut += 120 - minut
+	*clr
+	cla
+	minut += 60 - minut
 	gs 'stat'
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -1069,12 +1112,16 @@ if $ARGS[0] = 'couple':
 	gs 'arousal', 'voyeur', 20
 	gs 'stat'
 	act 'Keep watching':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/couple.gif"></center>'
 		'You watch them, they are very passionate and surprisingly tender in their love making and that is what this is. They are making love instead of fucking, many minutes go by. Then she starts to spasm, obviously having a orgasm. He keeps it up through her whole orgasm, once it is finally over. They quickly get dressed and straighten up their clothes, they have one more final passionate kiss before heading back to the front of the library.'
 		gs 'arousal', 'voyeur', 20
 		gs 'stat'
 		act 'Masturbate':
+			*clr
+			cla
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 			'After they leave you are unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1086,7 +1133,8 @@ if $ARGS[0] = 'couple':
 		end
 	end
 	act 'Masturbate':
-		gs 'arousal', 'mast', 80 !!just want to make sure this causes a orgasm
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again, you peek around the corner but the couple is gone. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1099,8 +1147,9 @@ if $ARGS[0] = 'couple':
 end
 
 if $ARGS[0] = 'Lesbian':
-	cls
-	minut += 120 - minut
+	*clr
+	cla
+	minut += 60 - minut
 	gs 'stat'
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -1109,12 +1158,16 @@ if $ARGS[0] = 'Lesbian':
 	gs 'arousal', 'voyeur', 20
 	gs 'stat'
 	act 'Keep watching':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/udesklick.gif"></center>'
 		'You watch them, Lera seems to really know how to lick pussy. Most likely she has a lot of practice at it, after awhile Lena finally has a orgasm. Once she does she pushes Lera''s face away form her pussy and gets dressed, as Lera continues to masturbate herself for some time before she finally has a orgasm as well. Once she does she moves up and takes a seat next to Lena, all smiles and the two of them start to talk. The seem intent on staying their for the rest of detention.'
 		gs 'arousal', 'voyeur', 20
 		gs 'stat'
 		act 'Masturbate':
+			*clr
+			cla
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 			'After they leave you are unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1126,6 +1179,8 @@ if $ARGS[0] = 'Lesbian':
 		end
 	end
 	act 'Masturbate':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again, you peek around the corner but the couple is gone. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1138,8 +1193,9 @@ if $ARGS[0] = 'Lesbian':
 end
 
 if $ARGS[0] = 'anal':
-	cls
-	minut += 120 - minut
+	*clr
+	cla
+	minut += 60 - minut
 	gs 'stat'
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -1148,12 +1204,16 @@ if $ARGS[0] = 'anal':
 	gs 'arousal', 'voyeur', 20
 	gs 'stat'
 	act 'Keep watching':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/anal.gif"></center>'
 		'You watch them them, he has massive amounts of endurance. It seems like he is never going to relent, a great deal of time passes, before he finally grunts and stops with his dick buried balls deep in her ass. After a couple of breaths he pulls out of her ass, pulling up his pants as he stands up. Lina is a little slower to get up, she pulls up her pants as well. Once they are both standing Ivan gives her a quick kiss and she is all smiles, the two of them then head back to the front of the library.'
 		gs 'arousal', 'voyeur', 20
 		gs 'stat'
 		act 'Masturbate':
+			*clr
+			cla
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 			'After they leave you are unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1165,6 +1225,8 @@ if $ARGS[0] = 'anal':
 		end
 	end
 	act 'Masturbate':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/mast.gif"></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes but no one wanders by and finally you orgasm hard, it rocks your whole body leaving you shaking in it''s aftermath. After a few minutes you recover and get dressed again, you peek around the corner but the couple is gone. You decided to head back to the tables at the front and wait out the rest of detention there.'
@@ -1182,17 +1244,18 @@ if $ARGS[0] = 'end':
 	elseif hour = 9:
 		minut += 60
 	end
-	gs 'stat'
 	minut += 60 - minut
+	gs 'stat'
 
-	gt 'gschool_detention', 'end'
+	gt 'gschool_grounds', 'main'
 end
 
 	
 !!event that take place the default start
 if $ARGS[0] = 'inappropriate clothes':
 !!this one can trigger if Sveta is dressed to slutty. If thinness, skirt short, top cut, or pants short has a value of 6 this triggers, or if two of these have a 5 it triggers, or if three of them have a rating of 4+ it triggers. If it triggers it takes the place of all the other detention events. 
-	cls
+	*clr
+	cla
 	gs 'stat'
 	gs 'gschool_events'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -1201,22 +1264,19 @@ if $ARGS[0] = 'inappropriate clothes':
 	*nl
 	'You too say "here" when he calls your name, cursing the fact that you are stuck here. Once he calls your name. "Miss <<$surname>>, just what do you think you are wearing?" he asks in a stern disapproving voice, you can tell he is not happy with your choice of attire.'
 	act 'Is something wrong?':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 		'You look down at your clothes and you know they are on the daring style but still. You look up at him. "Is there something wrong?"'
 		'He seems flabbergasted you would even ask that. "Is there something... yes there is something wrong those clothes are completely inappropriate for school and you know that. Don''t pretend you don''t."'
 		'Well damn maybe you can talk your way out of this before you get more detention. "I didn''t...." before you can say more he cuts you off and gets up. "I don''t want to hear it Miss <<$surname>>." He pauses a moment before continuing. "You can come up here and accept your punishment from me or we can go see the principal your choice."'
 		act 'Go to the principal': gt 'gschool_office', 'detPunishment'
-		act 'Take the offer':
-!!code for high butt spanking pain.
-			'<center><b><font color="maroon">Detention</font></b></center>'
-			'<center><img src="images/locations/pavlovsk/school/detention/detspank.gif"></center>'
-			'You get up and walk up to him. "I would rather just take my punishment here." He nods and pulls a large wooden paddle out of the desk. "Alright bend over the desk." You do as you told and the first swat stings more than you expected it would. He put a lot of force into that swing, each follow up one hurts even more, by the time he swats you for the eight time you are on the verge of crying it hurts to much.'
-			'Finally he stops. "Return to your seat and behave yourself. The goes for the rest of you too." He says while point the paddle at the rest of the students. You gingerly return to your seat and sit down slowly, it hurts to sit but you have no choice. The rest of detention passes very quietly with everyone unusually well behaved.'
-			act 'Go home':minut += 15 & gt 'gschool_detention', 'end'
-		end
+		act 'Take the offer': gt 'gschool_detention', 'offer'
 	end
-	act 'Be a smart ass.':
+	act 'Be a smart ass':
+		*clr
+		cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 		'You pause a moment and look him over. "I know with your lack of fashion sense that you might not understand style, but surely even you must realize these are clothes." You tell him with a smirk which gets several of the other students snickering.'
@@ -1225,6 +1285,16 @@ if $ARGS[0] = 'inappropriate clothes':
 	end
 end
 
+if $ARGS[0] = 'offer':
+	*clr
+	cla
+	gs 'pain', 5, 'asscheeks', 'spank'
+	'<center><b><font color="maroon">Detention</font></b></center>'
+	'<center><img src="images/locations/pavlovsk/school/detention/detspank.gif"></center>'
+	'You get up and walk up to him. "I would rather just take my punishment here." He nods and pulls a large wooden paddle out of the desk. "Alright bend over the desk." You do as you told and the first swat stings more than you expected it would. He put a lot of force into that swing, each follow up one hurts even more, by the time he swats you for the eight time you are on the verge of crying it hurts to much.'
+	'Finally he stops. "Return to your seat and behave yourself. The goes for the rest of you too." He says while point the paddle at the rest of the students. You gingerly return to your seat and sit down slowly, it hurts to sit but you have no choice. The rest of detention passes very quietly with everyone unusually well behaved.'
+	act 'Go home':minut += 15 & gt 'gschool_detention', 'end'
+end
 
 --- gschool_detention ---------------------------------
 

+ 74 - 117
locations/gschool_events

@@ -215,24 +215,31 @@ end
 if $ARGS[0] = 'rand_gopnic':
 !!I am splitting this up into gopnik and not gopnik, make sure the code is right please.
 	if grupTipe[r] = 4:
+		*clr
+		cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<r>>.jpg"></center>'
 		'You step away from him, pulling out of reach as you turn around. You point your finger at him. "Don''t make me hurt you, you know I will."'
 		'He laughs a bit and steps up closer again, crowding you a bit but keeps his hands to himself. "Come on <<$pcs_nickname>> you know you want to have some fun, stop acting like you are not all hot and bothered by this. We can help you with that itch."'
 		act 'Back off':
+			*clr
+			cla
 			grupvalue[4] += 5
 			pcs_exhibition += 5
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/buttflash.gif"></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.'
 		end
 		act 'Sure why not':
-			cls
+			*clr
+			cla
 			if grupvalue[4] > 50:
 				grupvalue[4] -= 5
 				if grupvalue[4] < 50:grupvalue[4] = 50
 			end			
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
 			'You are in the mood anyways so why not, hopefully it isn''t to quick. They lead you to the men''s room, one of the guys drives everyone else out; it''s just you and the Gopniks in there now. One of them leans against the door to block anyone else from coming in. While the rest all start unzipping their pants and pulling out their dicks.'
-			'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way. On the wall of the restroom, you see written in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+			'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.'
+			*nl
+			if pav_slut > 25: 'On one wall you see written in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
 			act 'Start sucking':
 				cls
 				if r = 9:
@@ -353,7 +360,6 @@ end
 
 if $ARGS[0] = 'rand_scoolboy':
 	scoolboy = rand(1,5)
-	gs 'gschool_events', 'rand_boy_arg', 1, 1, 1, 1, 1, 0
 	*clr & cla
 	if scoolboy = 1:
 		if DimaRudeBlock = 0 and rand(0,2) = 0:
@@ -372,6 +378,7 @@ if $ARGS[0] = 'rand_scoolboy':
 			r = 36
 		end
 	elseif scoolboy = 4:
+		if pav_sex >= 50 and kotovLoveQW <= 0: gt 'gschool_events', 'rand_gopnic'
 		if rand(0,1) = 0:
 			r = 9
 		else
@@ -391,15 +398,11 @@ if $ARGS[0] = 'rand_scoolboy':
 !!This one is fine if it is random but Fedor should be blocked if they are dating.
 			'You can tell from his disappointed expression that <<$rand_boy>> was the one groping your ass. Perhaps he was expecting something firmer, after hanging out with the athletic girls so much? Maybe you should work out more...'
 		elseif scoolboy = 1:
-!!instead of random have it be Dimka(though he is blocked if you erased the video tape he can get), Igor, Andrey, or Mefodiy(Not sure on him, I don't know if he is openly gay or not, if he is not he might do it to hide being gay. You wanted to do a story with him so your call if he is included here.)
+!!instead of random have it be Dimka(though he is blocked if you erased the video tape he can get), Igor, Andrey, or Mefodiy(Not sure on him, I don''t know if he is openly gay or not, if he is not he might do it to hide being gay. You wanted to do a story with him so your call if he is included here.)
 			'Even though he tries to hide it as best he can, the proud grin the face of <<$rand_boy>> tells you that he was the one groping your ass.'
 		elseif scoolboy = 4:
 !!instead of random lets make it Vitek, Dan, or Vasily which uses group 1 in this pav_sex act. Or Roman, Lavrenti, Radomir or Arkadi then it is group two for the pav_sex act
 			'The brazen look on his face betrays <<$rand_boy>>, it must have been him touching your ass. Knowing him, he probably would''ve gone further if there weren''t so many people here.'
-			if pav_sex >= 50 and kotovLoveQW <= 0: 
-				gt 'gschool_events', 'rand_gopnic'
-			exit
-			end
 		elseif scoolboy = 5:
 !!Random is fine since we only have two of them currently and Fedor if he becomes a outcast but again block Fedor if Sveta is still seeing him.
 			'<<$rand_boy>> is trembling slightly, his eyes shifting back and forth as he awkwardly tries to not be noticed by you. It must''ve been him.'
@@ -413,7 +416,7 @@ if $ARGS[0] = 'rand_scoolboy':
 			'Wait a minute... you don''t recognize any of these people! You must be in the wrong classroom!'
 		end		
 		if npc_rel[$static_num] <= 50 and scoolboy ! 3:
-!!this option doesn't show up if it is a outcast since the text above says you believe him.
+!!this option doesn''t show up if it is a outcast since the text above says you believe him.
 			act 'Slap him across the face as hard as you can':
 				*clr & cla
 				npc_rel[$static_num] -= 5
@@ -570,69 +573,48 @@ if $ARGS[0] = 'phone':
 	act 'Put your phone away':
 		*clr
 		cla
-		*nl
+		grupvalue[3] += 5
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 		'You decide not to aggravate the situation and put your phone away. <<$teacher>> looks at you gratefully as he continues his classes.'
 		act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end'
-	
 	end
-	
-	if sub < 30:
-		
-		act 'Keep using your phone':
+	act 'Keep using your phone':
+		*clr
+		cla
+		demerit += 5
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
+		'Even though <<$teacher>> saw you use your phone, he didn''t do anything. You figure you can get away with it, and just keep browsing the internet. Realizing you still won''t put the phone away, <<$teacher>> walks over to your desk.'
+		act 'Take photos under your skirt':
 			*clr
 			cla
-			*nl
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
-			'Even though <<$teacher>> saw you use your phone, he didn''t do anything. You figure you can get away with it, and just keep browsing the internet. Realizing you still won''t put the phone away, <<$teacher>> walks over to your desk.'
-			
-			if pcs_dom > 70:
-				
-				act 'Take photos under your skirt':
-					*clr
-					cla
-					pcs_horny += 10
-					*nl
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
-					'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see <<$teacher>> walk towards your desk.'
-					'When the teacher arrives at your desk, he sneers, "And what could you be doing on your phone that''s more important than paying attention in class, Mrs. <<$pcs_lastname>>? Hand it over."'
-					'"Wouldn''t you like to know!" you tease him. You hand over your phone, the screen still on, with the folder containing the photos you just shot opened.'
-					'<<$teacher>> looks at what''s on the screen and his face colors bright red as he turns the screen off and returns to the front of the class.'
-					'As he gets ready to continue his lessons he says, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class." Later when the class is working on their homework assignments, you can see him browsing your phone when he thinks no one is looking.'
-					
-					act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end' 
-				
-				end
-			
-			end
-			
-			if pcs_dom > 30:
-				
-				act 'Put the phone between your boobs':
-					*clr
-					cla
-					*nl
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
-					'You deftly shove the phone in your bra, and smile fiendishly as you see the indecisiveness on your teacher''s face.'
-					'You pretend it''s a perfectly normal place to store your phone, and use your cute voice as you tell him, "Is there a problem, <<$teacher>>? Go ahead, take my phone if you don''t think I should have it." You thrust your chest forward as you encourage him, giving him a nice view of your ample cleavage - the outline of your phone very visible through the fabric.'
-					'Your teacher is completely flabbergasted by your move, and admits defeat. Deciding it''s not worth the effort to take your phone away from you without causing all sorts of awkward situations, he simply returns to the front of the class and continues his lessons. You don''t catch much of them though, you''re too busy browsing the internet after you pull your phone back out of your bra.'
-					
-					act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end' 
-				
-				end
-			
-			end
-			
-			act 'Hand over the phone':
-				*clr
-				cla
-				*nl
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
-				'Wow, he called your bluff. You decide it''s not worth the conflict, and silently hand your phone to <<$teacher>>.'
-				'As he walks back to the front of the class, he says, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class."' 
-				
-				act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end' 
-			end
+			pcs_horny += 10
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
+			'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see <<$teacher>> walk towards your desk.'
+			'When the teacher arrives at your desk, he sneers, "And what could you be doing on your phone that''s more important than paying attention in class, Mrs. <<$pcs_lastname>>? Hand it over."'
+			'"Wouldn''t you like to know!" you tease him. You hand over your phone, the screen still on, with the folder containing the photos you just shot opened.'
+			'<<$teacher>> looks at what''s on the screen and his face colors bright red as he turns the screen off and returns to the front of the class.'
+			'As he gets ready to continue his lessons he says, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class." Later when the class is working on their homework assignments, you can see him browsing your phone when he thinks no one is looking.'
+			act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end' 
+		end	
+		act 'Put the phone between your boobs':
+			*clr
+			cla
+			demerit += 5
+			grupvalue[4] += 5
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
+			'You deftly shove the phone in your bra, and smile fiendishly as you see the indecisiveness on your teacher''s face.'
+			'You pretend it''s a perfectly normal place to store your phone, and use your cute voice as you tell him, "Is there a problem, <<$teacher>>? Go ahead, take my phone if you don''t think I should have it." You thrust your chest forward as you encourage him, giving him a nice view of your ample cleavage - the outline of your phone very visible through the fabric.'
+			'Your teacher is completely flabbergasted by your move, and admits defeat. Deciding it''s not worth the effort to take your phone away from you without causing all sorts of awkward situations, he simply returns to the front of the class and continues his lessons. You don''t catch much of them though, you''re too busy browsing the internet after you pull your phone back out of your bra.'
+			act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end' 
+		end
+		act 'Hand over the phone':
+			*clr
+			cla
+			grupvalue[3] += 5
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
+			'Wow, he called your bluff. You decide it''s not worth the conflict, and silently hand your phone to <<$teacher>>.'
+			'As he walks back to the front of the class, he says, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class."' 
+			act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end' 
 		end
 	end
 end
@@ -640,71 +622,54 @@ 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 to you what you are doing wrong, and slowly but surely you begin to understand.'
-
 	act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end'
-	
 	act 'Gently touch his hand':
 		*clr
 		cla
 		npc_rel['A26'] += 1
-		*nl
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/touchhands.gif"></center>'
 		'You lightly run your fingers across the palm of his hand as you listen to his explanation. After he quickly checks to make sure no one is paying attention to you, he reciprocates and takes your hand in his left hand. Seconds later you feel his right hand on the small of your back, gently rubbing it as he continues to explain a difficult to understand part of today''s lesson.'
 		*nl
 		'You move your hips a bit closer to his, and lean closer to him as you try to understand what he''s explaining. When he''s done with his explanation, you whisper in his ear, "You''re so smart and strong, <<$teacher>>. I wish you would teach classes in University, so I could go to your classes for several years more when I finish here. There''s still so much you can teach me."'
 		'You notice a small shiver roll down his spine as he walks back to his desk.'
-		
 		act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end'
 	
 	end
-	
-	if pcs_dom > 30:
-		
-		act 'Coerce him':
-			*clr
-			cla
-			npc_rel['A26'] += 1
-			pcs_horny += 20
-			pcs_dom += 1
-			*nl
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashteach.gif"></center>'
-			'Edging closer and closer to <<$teacher>> while he''s helping you with today''s lesson, you step back and pull open your shirt, exposing your pert young breasts. He wasn''t sure what to do about it, but from the look on his face he clearly knows this is wrong.'
-			*nl
-			'Your voice turns into a menacing whisper, "You don''t want to do that, <<$teacher>>. If you touch my tits, I will report you for molestation. Why don''t you put those fingers to work on my pussy instead? I think we would both enjoy that much more." You give him a mischievous smile, and you can tell he is thoroughly confused now. You know he''s definitely on board with the idea, but at the same time has his doubts. You decide to help him decide, and pull your skirt up slightly so he has easier access. Making sure he knows you''re still in charge, you whisper seductively, "Go ahead, <<$teacher>>. I''m soaking wet right now don''t you want to feel it?"'
-			*nl
-			'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, <<$teacher>> can''t you feel how wet I am?" Making sure no one else sees what he''s doing, his actions grow more and more bold as he begins to rub your pussy stronger. Then he plunges in two fingers and begins to fuck you with them. Even though it feels nice, that''s not what you had in mind. "That''s enough. Now pull them out and lick them!" you order him. He obeys without hesitation and puts his fingers in his mouth, licking your pussy juices off them. Indicating you''re done with him now, you tell him to go help someone else. <<$teacher>> will definitely not forget today''s lesson for a long time.'
-			
-			act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end'
-		
-		end
-	
+	act 'Coerce him':
+		*clr
+		cla
+		npc_rel['A26'] += 1
+		pcs_horny += 20
+		pcs_dom += 1
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashteach.gif"></center>'
+		'Edging closer and closer to <<$teacher>> while he''s helping you with today''s lesson, you step back and pull open your shirt, exposing your pert young breasts. He wasn''t sure what to do about it, but from the look on his face he clearly knows this is wrong.'
+		*nl
+		'Your voice turns into a menacing whisper, "You don''t want to do that, <<$teacher>>. If you touch my tits, I will report you for molestation. Why don''t you put those fingers to work on my pussy instead? I think we would both enjoy that much more." You give him a mischievous smile, and you can tell he is thoroughly confused now. You know he''s definitely on board with the idea, but at the same time has his doubts. You decide to help him decide, and pull your skirt up slightly so he has easier access. Making sure he knows you''re still in charge, you whisper seductively, "Go ahead, <<$teacher>>. I''m soaking wet right now don''t you want to feel it?"'
+		*nl
+		'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, <<$teacher>> can''t you feel how wet I am?" Making sure no one else sees what he''s doing, his actions grow more and more bold as he begins to rub your pussy stronger. Then he plunges in two fingers and begins to fuck you with them. Even though it feels nice, that''s not what you had in mind. "That''s enough. Now pull them out and lick them!" you order him. He obeys without hesitation and puts his fingers in his mouth, licking your pussy juices off them. Indicating you''re done with him now, you tell him to go help someone else. <<$teacher>> will definitely not forget today''s lesson for a long time.'
+		act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end'
 	end
-	
 	act 'Move the discussion to personal topics':
 		*clr
 		cla
 		npc_rel['A26'] += 1
-		*nl
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teacherhelp.jpg"></center>'
 		'As he is explaining a part of today''s lesson to you, you ask him, "Where do you live?"'
 		'"I live near the factory, in one of the standalone houses there. Anyway, about the lesson." he replies.'
 		'You ignore his attempt to get back to teaching and nod. "I see how about Valeria? Do you and her get along?"'
 		'His face saddens, "We don''t talk much. By the time I come home from work, she''s never there. Her mother also has a job, so no one keeps an eye on her. Unfortunately I can only really talk to her on weekends on weekdays she always comes home late, and too drunk to carry a conversation."'
-		
-		if pcs_dom > 30:
-			pcs_dom += 1
-			*nl
+		act 'Seduce':
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teacherhelp.jpg"></center>'
 			'You smile at him empathetically, and as you put your hand on his shoulder for a brief moment you ask him in a stern voice, "Would you like me to have a talk with her? My father left when I was still a baby your daughter doesn''t know what she''s missing, I would kill to have a good relationship with a father as great as you. I bet I could help her realize that."'
 			'<<$teacher>> is grateful for the offer, but declines, "Thank you <<$pcs_nickname>>, but I should really be solving this myself. It''s kind of you to offer though, you''re a good person."'
 			'You give him en encouraging pat on the shoulder before you pull your hand back, and nod, "I suppose you''re right, <<$teacher>>. Don''t worry, everything will be fine."'
 			'He tries to focus on teaching you for the remainder of the class, but you can tell his mind is elsewhere. He must be mulling over what you said.'
-		
-		else
-			*nl
+		end
+		act 'Be helpful':
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teacherhelp.jpg"></center>'
 			'You suggest, "Maybe you love her so much that you''re afraid to do something that would make her dislike you? If you were more strict, I bet you could get her to listen. You''re a teacher, you educate youngsters for a living! You just have to teach your daughter about the ways of life, like you''re doing here in class every day."'
 			'You have a point, and <<$teacher>> knows it. He simply nods and replies, "I''ll... I''ll try", before returning to his desk at the front of the class.'
-		
 		end
-		
 		act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end'
 	end
 end
@@ -746,22 +711,14 @@ if $ARGS[0] = 'legs':
 		*clr
 		cla
 		npc_rel['A26'] += 1
-		if sub < 30:
-!!there is two images below one for panties and one for no panties, not sure how you want to code it, as it should appear above the text just below here as well.
-			*nl
-			'You spread your legs slowly, giving <<$teacher>> an even better look of what''s between there. He''s stunned, blankly staring at you for a moment while avoiding your look. Realizing what you''re up to, he grows bolder and takes a good look. After that he pretends to read the magazine he is holding.'
+		if tanga = 1:
+			pcs_horny += 30
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spread.jpg"></center>'
+			'The thoughts of him checking you out so sneakily turns you on a great deal, and the fact that you know you should know better makes it even hotter. Throughout the class you keep spreading your legs whenever he looks your way, and you can tell the looks of your panties are causing him a great deal of arousal as well. Unable to control yourself you occasionally give yourself a quick rub over your pussy lips through your underwear, preferably when he looks at you. Towards the end of the class your panties have a large damp spot on them; large enough for him to see from across the room. The outline of your pussy is clearly visible in the wet fabric.'
 		else
-			if tanga = 1:
-				pcs_horny += 30
-				*nl
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spread.jpg"></center>'
-				'The thoughts of him checking you out so sneakily turns you on a great deal, and the fact that you know you should know better makes it even hotter. Throughout the class you keep spreading your legs whenever he looks your way, and you can tell the looks of your panties are causing him a great deal of arousal as well. Unable to control yourself you occasionally give yourself a quick rub over your pussy lips through your underwear, preferably when he looks at you. Towards the end of the class your panties have a large damp spot on them; large enough for him to see from across the room. The outline of your pussy is clearly visible in the wet fabric.'
-			else
-				pcs_horny +=40
-				*nl
-				'<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
+			pcs_horny +=40
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spreadb.jpg"></center>'
+			'The thoughts of him checking you out so sneakily turns 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_lunch', 'lesson_end'

+ 44 - 39
locations/gschool_grounds

@@ -21,6 +21,50 @@ if $ARGS[0] = 'main':
 		'With the school open you can go to the <a href="exec:gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
+	if day = 31 and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock ! 1:
+		if hour = 14:
+			'All the boys and girls are standing near the school. Everyone did their best to look good today, wearing their nicest clothes. Someone calls out to you, "Hey <<$pcs_nickname>>, are you coming to the New Year''s Eve party or not? You didn''t pay the 1000 <b>₽</b> entry fee yet!"'
+
+			if money >= 1000:act 'Go to the party (1,000 <b>₽</b>)':money -= 1000 & gt 'sny', 'start'
+		end
+	end
+
+	if hour <= 8 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 6:
+		'Today is graduation day! The school prom is tonight as well.'
+
+		act 'Go to your graduation':
+			cls
+			miunt += 120
+			SchoolAtestat = 1
+			intel_exp += 10
+			kanikuli = 7
+			gs 'stat'
+			'Everyone from your year is assembled in the classroom. Your teachers have gathered in front of the class, and congratulate all of you on completing high school. As they hand everyone their well-earned diplomas, they wish you luck for the future.'
+
+			act 'Return to town':gt 'pavResidential'
+
+			act 'Go to the prom party':
+				cls
+				minut += 540
+				fat += 12
+				pcs_energy += 70
+				alko += 5
+				cumspclnt = 2
+				gs 'cum_cleanup'
+				pcs_breath = 0
+				tanga = 0
+				gs 'stat'
+				gs 'clothing', 'strip'
+!gee gee, no normal outlet
+				'After the official graduation, everyone gets hammered at the prom party. You don''t remember much of what happened, only recalling a few flashbacks of going skinny dipping in the town fountain with a group of friends. Your mouth is dry and you can taste beer and what might be a kebab, you are somewhere in the town center, all of your clothes are missing and you are completely naked.'
+				'You make your way back home, you think you are discrete and stick to poorly lit areas but you really don''t remember and somehow have bits of someone''s hedge in your hair.'
+
+				act 'Go home':gt 'korrPar'
+			end
+		end
+	exit
+	end
+
 	act 'Go to the sports field': gt 'gschool_grounds', 'sports'
 
 !!	act 'Go to old school building': gt 
@@ -110,45 +154,6 @@ if $ARGS[0] = 'main':
 		gt 'NikoEv2', 'Recovery'
 	end	
 
-	if day = 31 and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock ! 1:
-		if hour = 14:
-			'All the boys and girls are standing near the school. Everyone did their best to look good today, wearing their nicest clothes. Someone calls out to you, "Hey <<$pcs_nickname>>, are you coming to the New Year''s Eve party or not? You didn''t pay the 1000 <b>₽</b> entry fee yet!"'
-
-			if money >= 1000:act 'Go to the party (1,000 <b>₽</b>)':money -= 1000 & gt 'sny', 'start'
-		end
-	end
-
-	if hour <= 8 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 6:
-		'Today is graduation day! The school prom is tonight as well.'
-
-		act 'Go to your graduation':
-			cls
-			SchoolAtestat = 1
-			intel_exp += 10
-			kanikuli = 7
-			gs 'stat'
-			'Everyone from your year is assembled in the classroom. Your teachers have gathered in front of the class, and congratulate all of you on completing high school. As they hand everyone their well-earned diplomas, they wish you luck for the future.'
-
-			act 'Return to town':gt 'pavResidential'
-
-			act 'Go to the prom party':
-				cls
-				minut += 120
-				alko += 5
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
-				tanga = 0
-				gs 'stat'
-				gs 'clothing', 'strip'
-!gee gee, no normal outlet
-				'After the official graduation, everyone gets hammered at the prom party. You don''t remember much of what happened, only recalling a few flashbacks of going skinny dipping in the town fountain with a group of friends. When you wake up somewhere in the town center, all of your clothes are missing and you are completely naked.'
-
-				act 'Go home':gt 'korrPar'
-			end
-		end
-	end
-
 	if hour >= 14 and pav_slut >= 75 and SchoolGossip > 0 and afterschoolday ! daystart:gt 'gschool_sex', 'suck'
 
 	if week = 1 and kanikuli = 0 and arthakQW = 10 and apmeetday ! daystart and hour >= 14:gt 'artgar'

+ 1 - 1
locations/pavComplexb2

@@ -92,7 +92,7 @@ if $ARGS[0] = 'etaj_4':
 	'<center>4th floor of the apartment building</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/etaj4.jpg"></center>'
 	'<center>The fourth floor stairwell was renovated not long ago, but some hoodlums already sprayed graffiti on the walls.</center>'
-	act 'Apartment number 17: Anushka Konstantinov': gt 'anushapt'
+	act 'Apartment number 17: Anushka Konstantinov': gt 'anushapt', 'home'
 	act 'Go down to the third floor': gt 'pavComplexb2','etaj_3'
 	act 'Go up to the fifth floor': gt 'pavComplexb2','etaj_5'
 	act 'Take the elevator': gt 'pavComplexb2','lift','etaj_4'

+ 1 - 1
locations/qwBarPolet

@@ -546,7 +546,7 @@ if $ARGS[0] = 'SoberEncounters':
 	if Sober_Enc_Rand = 1 and Jaska_Ev = 0:
 		*clr
 		cla
-		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/Billiard 1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/Billiard 1.png"></center>'
 		minut += 5
 		'While you''re sitting idly at the counter, drink in hand, you take a look around the room. After a moment, your attention is pulled to three guys playing pool. Two of them look to be in their mid to late 30s, while the third looks to be in his early 20s. They’re all dressed casually albeit a bit rough looking.'
 		*nl

+ 2 - 24
locations/shoes

@@ -38,14 +38,6 @@ $shoe_list_line = {
 	
 	$RESULT += '<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a></TD>'
 
-		$RESULT += '<TD>'
-		if cloc ! 1:$RESULT += ' <a href="exec:gt ''shoes'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Storage</a><BR>'
-		if cloc ! 0:$RESULT += ' <a href="exec:gt ''shoes'', ''dest0'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Wardrobe</a><BR>'
-		if cloc ! 2:$RESULT += ' <a href="exec:gt ''shoes'', ''dest2'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Unwanted</a>'
-		$RESULT += '</TD>'
-	else
-		$RESULT += '</TD>'
-	end
 }
 
 !!cloc, 0 = wardrobe, 1 = storage, 2 = unwanted
@@ -112,29 +104,15 @@ if $ARGS[0] = 'view_shoe_list':
 
 	if $ARGS[1] ! 'sell' :
 		'<center><b>Selecting shoes to wear with <<$cloType>> outfit</b></center>'
-		'<center><table border=1><TH><a href="exec:gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Wardrobe </a></TH><TH><a href="exec:gt ''shoes'', ''view_shoe_list'', ''store''">Storage</a></TH><TH><a href="exec:gt ''shoes'', ''view_shoe_list'', ''unwanted''">Unwanted</a></TH></center>'
 	end
 
 	$bgcolor='#f3f4ee'
 
 	if $ARGS[1] = 'sell':
-		'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Shoe</TH><TH>Description</TH><TH>Bimbo</TH><TH>Stripper</TH><TH>Actions</TH><TH>Move to</TH>'
+		'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Shoe</TH><TH>Description</TH><TH>Bimbo</TH><TH>Stripper</TH><TH>Actions</TH>'
 	else
-		'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Shoe</TH><TH>Description</TH><TH>Bimbo</TH><TH>Stripper</TH><TH>Actions</TH><TH>Move to</TH>'
+		'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Shoe</TH><TH>Description</TH><TH>Bimbo</TH><TH>Stripper</TH><TH>Actions</TH>'
 	end
-	
-	if $ARGS[1] = 'wardrobe':
-		cloc = 0
-	end
-	
-	if $ARGS[1] = 'store':
-		cloc = 1
-	end
-	
-	if $ARGS[1] = 'unwanted':
-		cloc = 2
-	end
-
 
 	if $cloType ! 'exercise':
 		i = 1

+ 2 - 12
locations/start

@@ -29,20 +29,13 @@ $version = '0.6.1 Shoes, like clothes for your feet.'
 
 opPRE = 1
 
-*nl
-*nl
-'<hr align="left" color="red" size="3" width="1200">'
-'<center><h2>Girl Life [English Community Version]</h2></center>'
-*nl
-'<center>This is game is based on the russian game ЭТО by DeGross.</center>'
-*nl
-'<hr align="left" color="red" size="3" width="1200">'
+'<center>This game is based on the Russian game ЭТО by DeGross.</center>'
 *nl
 '<center>Version <b><<$version>></b></center>'
 *nl
-*nl
 '<center><font color="red"><b>Children under 18 years are strictly forbidden to play</b></font>'
 *nl
+'<center><img <<$set_imgh>> src="images/system/gl3.jpg" ></center>'
 *nl
 'This game is about the simulated life of a woman containing elements of RPG, strategy, porn and magical combat.'
 'You may choose what kind of life the character will live according to your play style, conscience or even personal beliefs.'
@@ -52,12 +45,9 @@ opPRE = 1
 'All characters in this game are fictional and any similarities to any persons living or dead are purely coincidental.'
 'The images used for sexual elements of this game are performed by 18yo and over consenting adults and used for illustrative purposes only.'
 *nl
-*nl
 '<b>Change log: <a href="exec:gt ''version''">Here</a></b>'
 *nl
-*nl
 '<b>* wiki (and copy of change log) available <a href="http://git.tfgamessite.com/KevinSmarts/girllife-ecv/wikis/home">here</a> (External link). *</center></b>'
-*nl
 
 act '<center><b>Start</b></center>':
 	cla

+ 1 - 1
locations/street_event

@@ -112,7 +112,7 @@ end
 
 
 if $ARGS[1] = 'main':
-	if lesbiday <= daystart + 21 and RAND(0,100) < streetev_mistmeet and lesbiQW >= 11 and hour >= 8 and hour < 21 and tanga = 1 and month > 2 and month ! 12 and sub > 0:gt 'lesbimistress', 'mistmeet'
+	if $ARGS[0] = 'street' or $ARGS[0] = 'down' or $ARGS[0] = 'Nord':if lesbiday <= daystart - 21 and RAND(0,100) < streetev_mistmeet and lesbiQW >= 11 and hour >= 8 and hour < 21 and tanga = 1 and month > 2 and month ! 12 and sub > 0:gt 'lesbimistress', 'mistmeet'
 
 
 	streetrand = rand(0, 100)

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio