소스 검색

Merge remote-tracking branch 'kevin/master'

sovietmercader 4 년 전
부모
커밋
9b7d495e0e

+ 1 - 1
locations/ParkKafe.qsrc

@@ -414,7 +414,7 @@ if $ARGS[0] = 'negros':
 	
 	if hotcat >= 5 and afra < 1:
 		afra = 1
-		'A few of the Africans come over to your table, they are quite unrestrained, talking a lot in English, grabbing your back and chest. One of them introducing himself as DeMarcus, he tells you that they are all students from Africa and live in the dorm, he gives you directions on how to get to the hostel and find them.'
+		'A few of the Africans come over to your table, they are quite unrestrained, talking a lot in English, grabbing your back and chest. One of them introducing himself as Djibril, he tells you that they are all students from Africa and live in the dorm, he gives you directions on how to get to the hostel and find them.'
 
 		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 	else

+ 2 - 2
locations/danceGev.qsrc

@@ -19,7 +19,7 @@ if danceevtimes >= 5:dancegevtipe = rand(0, 3)
 
 if dancegevtipe = 0:
 	'You see Veronichka Mokhova doing stretches, you watch as see does the splits her g-string leaving nothing to your imagination.'
-	if lesbian > 0:gs 'arousal', 'voyeur', 5, 'lesbian'
+	if lesbian > 0:gs 'arousal', 'voyeur', 5
 	gs 'stat'
 elseif dancegevtipe = 1:
 	'You see Veronichka Mokhova doing a handstand.'
@@ -27,7 +27,7 @@ elseif dancegevtipe = 2:
 	'You watch Veronichka Mokhova warming up.'
 elseif dancegevtipe = 3:
 	'Veronichka Mokhova goes from a handstand to the splits, you realise she is not wear any panties and probably thought she was alone.'
-	if lesbian > 0:gs 'arousal', 'voyeur', 5, 'lesbian'
+	if lesbian > 0:gs 'arousal', 'voyeur', 5
 	gs 'stat'
 end
 gs 'arousal', 'end'

+ 6 - 1
locations/din_bad.qsrc

@@ -199,7 +199,6 @@ if $ARGS[0] = 'd_bag':
 	if bcream_have > 0:'<a href="exec:dynamic $use_bcream & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<bcream_have>></b> cream left in your purse.'
 	if aphrodisiac_have > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $aphrodisiac_msg & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<aphrodisiac_have>></b> gum left in your purse.'
 
-	if lubri > 0:'There''s a tube of lubricant in your purse, enough for <b><<lubri>></b> applications.'
 	if refillable_bottle = 4: 
 		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: refillable_bottle = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
 	elseif refillable_bottle = 3:
@@ -711,6 +710,10 @@ $d_cycreport_update = {
 				temp[1] = daystart-daylastperiod
 				if tabletkishot > 0:
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>You are currently protected by a birth control shot.</font>'
+				elseif birth_control['implant_status'] > 1 and pillcon2 >= 30000:
+					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>Your implant protects you from getting pregnant.</font>'
+				elseif birth_control['implant_status'] > 1 and pillcon2 < 30000:
+					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=red>Your implant is not yet effective.</font>'				
 				elseif pillcon2 > 30000:
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>You are currently on the birth control pill.</font>'
 				elseif pillcon2 > 8000 and ((FocH > (Foch_Max - 96)) or ovulate > 0):
@@ -721,6 +724,8 @@ $d_cycreport_update = {
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. You have taken the pill but it will be several weeks before it is fully effective.'
 				elseif FocH > (Foch_Max - 96) or ovulate > 0:
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=red>It is currently your fertile stage.</font>'
+				elseif birth_control['implant_status'] = 1:
+					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=red>Your implant stopped working. You need a new one.</font>'
 				else
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period.'
 				end

+ 18 - 18
locations/dorm.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'start':
 		act 'Leave': minut += 5 & gt 'island'
 
 		if afra > 0 and hour < 22 and hour >= 7:
-			act 'I''m here to visit DeMarcus':
+			act 'I''m here to visit Djibril':
 				cla
 				'You say that you are here to visit the african students. The janitor remarks, "Look at this whore... What, your own kind not good enough for you? Go ahead and take care of those black cocks."'
 				reccoldorm = 1
@@ -122,7 +122,7 @@ if $ARGS[0] = 'korr':
 	end
 
 	if afra > 0 and hour < 22 and hour >= 7:
-		act 'DeMarcus'' room':
+		act 'Djibril'' room':
 			cla
 			afrand = rand(1, 2)
 
@@ -213,7 +213,7 @@ if $ARGS[0] = 'demarcusfuck':
 		afrand1 = rand(1,17)
 	end
 	gs 'stat'
-	act 'Drink with DeMarcus':
+	act 'Drink with Djibril':
 		cla
 		cls
 		minut += 120
@@ -231,7 +231,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra.jpg"></center>'
-			'DeMarcus lays you on the bed, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
+			'Djibril lays you on the bed, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -240,7 +240,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra1.jpg"></center>'
-			'DeMarcus lays you on the floor, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
+			'Djibril lays you on the floor, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -249,7 +249,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra2.jpg"></center>'
-			'DeMarcus pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before penetrating your pussy.'
+			'Djibril pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before penetrating your pussy.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -259,7 +259,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_ass += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra4.jpg"></center>'
-			'DeMarcus pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before thrusting his thick cock into your asshole.'
+			'Djibril pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before thrusting his thick cock into your asshole.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			anal_slip += 4
 			$orgasm_or = 'yes'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra24.jpg"></center>'
-			'DeMarcus pushes you on all fours on the bed, he pulls out his huge black cock and salms into your pussy, stretching it to the limit.'
+			'Djibril pushes you on all fours on the bed, he pulls out his huge black cock and salms into your pussy, stretching it to the limit.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -279,7 +279,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_ass += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra16.jpg"></center>'
-			'DeMarcus pushes you face down ass up on the bed and pulls out his huge black cock. He makes you spread wide apart and before you know it he enters your asshole.'
+			'Djibril pushes you face down ass up on the bed and pulls out his huge black cock. He makes you spread wide apart and before you know it he enters your asshole.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			anal_slip += 4
 			$orgasm_or = 'yes'
@@ -290,7 +290,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_ass += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra13.jpg"></center>'
-			'DeMarcus throws you on the bed and easily picks your back part up as he penetrates your asshole with his huge black cock.'
+			'Djibril throws you on the bed and easily picks your back part up as he penetrates your asshole with his huge black cock.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			anal_slip += 4
 			$orgasm_or = 'yes'
@@ -301,7 +301,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_ass += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra20.jpg"></center>'
-			'DeMarcus lays on the bed, you stradle him and force your asshole down on his huge black cock.'
+			'Djibril lays on the bed, you stradle him and force your asshole down on his huge black cock.'
 			'You ride his thick cock until you orgasm a few times. He cums inside you and passes out.'
 			anal_slip += 4
 			$orgasm_or = 'yes'
@@ -311,7 +311,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra11.jpg"></center>'
-			'DeMarcus throws you on the bed and easily picks your back part up as he penetrates your pussy with his huge black cock.'
+			'Djibril throws you on the bed and easily picks your back part up as he penetrates your pussy with his huge black cock.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -330,8 +330,8 @@ if $ARGS[0] = 'demarcusfuck':
 			spafinloc = 11
 			gs 'cum_manage'
 			afra += 1
-			'DeMarcus has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
-			'While DeMarcus is fucking your mouth, you carefully massage and finger your pussy. DeMarcus takes out his cock and as cums all over your face, you orgasm.'
+			'Djibril has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
+			'While Djibril is fucking your mouth, you carefully massage and finger your pussy. Djibril takes out his cock and as cums all over your face, you orgasm.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
 			gs 'arousal', 'bj', 20
@@ -351,8 +351,8 @@ if $ARGS[0] = 'demarcusfuck':
 			gs 'cum_manage'
 			afra += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra10.jpg"></center>'
-			'DeMarcus has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
-			'While DeMarcus is fucking your mouth, you carefully massage and finger your pussy. DeMarcus takes out his cock and as cums all over your face, you orgasm.'
+			'Djibril has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
+			'While Djibril is fucking your mouth, you carefully massage and finger your pussy. Djibril takes out his cock and as cums all over your face, you orgasm.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
 			gs 'arousal', 'bj', 20
@@ -363,8 +363,8 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra42.jpg"></center>'
-			'DeMarcus lays you on the bed, and pulls out his huge black cock. He spreads your legs apart as he slams into your pussy.'
-			'While DeMarcus furiously pounds you, you orgasm a few times on his cock. Just as he''s about to cum he pulls out and cums on you sore clit.'
+			'Djibril lays you on the bed, and pulls out his huge black cock. He spreads your legs apart as he slams into your pussy.'
+			'While Djibril furiously pounds you, you orgasm a few times on his cock. Just as he''s about to cum he pulls out and cums on you sore clit.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
 		end

+ 2 - 3
locations/glake.qsrc

@@ -59,12 +59,11 @@ if storyline = 1 and (month <= 2 or month = 12):
 	end
 end
 
-!! Why wouldn''t this happen in the summer?
 if storyline = 1 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)) and rand(0,4) = 0:
-	if week <= 5 and hour >= 15 and hour <= 20 and $clothingworntype = 'nude' and rand(0,3) = 0 and christinaphotos ! daystart:
+	if week <= 5 and hour >= 15 and hour <= 20 and $clothingworntype = 'nude' and rand(0,3) = 0 and socialchg['christina_day'] ! daystart:
 		gt 'gschool_socialchg1', 'chrislina_naked'
 	else
-		'<a href="exec:gt ''gschool_socialchg1'', ''tChristina''">Christina</a> is standing by the beach looking out over the lake. You also notice <a href="exec:gt ''gschool_socialchg1'', ''tLina''">Lina</a> in the background standing next to her, breathing heavily.'
+		iif(socialchg['tChristina_day'] ! daystart, '<a href="exec:gt ''gschool_socialchg1'', ''tChristina''">Christina</a>', 'Christina')+' is standing by the beach looking out over the lake. You also notice '+iif(socialchg['tLina_day'] ! daystart, '<a href="exec:gt ''gschool_socialchg1'', ''tLina''">Lina</a>', 'Lina')+' in the background standing next to her, breathing heavily.'
 		act'Walk away':gt'glake'
 	end
 end

+ 7 - 9
locations/gschool_grounds.qsrc

@@ -320,15 +320,15 @@ if $ARGS[0] = 'sports':
 	*clr & cla
 	gs 'stat'
 	if month > 2 and month < 9:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school//grounds/field.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/field.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school//grounds/fieldwinter.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/fieldwinter.jpg"></center>'
 	end
 	'There is a football field and around it is a track, often before and after school kids use the field and track.'
 
-	if week = 5 and hour >= 16 and hour <= 18: 'As you pass by the sports field you hear lots of cheering and yelling coming from the younger kids on the field. As you approach you see <a href="exec: gt ''gschool_socialchg1'', ''tLazar''">Lazar</a> is on the football field showing off his skills.'
+	if week = 5 and hour >= 16 and hour <= 18: 'As you pass by the sports field you hear lots of cheering and yelling coming from the younger kids on the field. As you approach you see '+iif(socialchg['tLazar_day'] ! daystart, '<a href="exec: gt ''gschool_socialchg1'', ''tLazar''">Lazar</a>', 'Lazar')+' is on the football field showing off his skills.'
 
-	if (week = 1 or week = 3) and hour >= 16 and hour <= 18: 'Looking toward what you can barely describe as a running track, you notice <a href="exec: gt ''gschool_socialchg1'', ''tSvyatoslav''">Svyatoslav</a> doing sprints by the football field.'
+	if (week = 1 or week = 3) and hour >= 16 and hour <= 18: 'Looking toward what you can barely describe as a running track, you notice '+iif(socialchg['tSvyatoslav_day'] ! daystart, '<a href="exec: gt ''gschool_socialchg1'', ''tSvyatoslav''">Svyatoslav</a>', 'Svyatoslav')+' doing sprints by the football field.'
 
 	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
@@ -457,16 +457,14 @@ if $ARGS[0] = 'bulding':
 end
 
 if $ARGS[0] = 'KristinaFight':
-	$location_type = 'event_outdoors'
 	*clr & cla
 	menu_off = 1
-	gs 'stat'
-
 	zverRageQW = 2
+	$location_type = 'event_outdoors'
+	gs 'stat'
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/christina/school/fight.mp4"></video></center>'
 	'As you cross the school yard after school, you are surprised by a powerful kick in your back. You fall to your hands and knees and rub your sore back for a second, before you turn around and see Christina Zvereva, her face contorted with rage. She yells at you, "You fucking bitch! How dare you spread shit about me like that? I''ll break your fucking face!"'
-!! Fightcheck
-	act 'fight':
+	act 'Fight her':
 		gs 'fight', 'initFight'
 		gs 'fight_npcdata', 'christina'
 		gt 'fight', 'start'

+ 8 - 3
locations/gschool_lessons1.qsrc

@@ -47,6 +47,8 @@ if $ARGS[0] = 'russian':
 		'All of a sudden you hear a loud bang, making the whole class jump up from their chairs.'
 		'Like a well trained unit, everyone in the room turns to look, only to see Lesco on the floor, his desk overturned; his cellphone sliding across the floor before clattering against the wall. Silence is soon replaced by laughter. The eyes of the entire class on him, Lesco struggles to act nonchalant as he works to quickly return his desk to an upright position and gather the items that had fallen to the floor.'
 		'Mr. Yenotin approaches Lesco, you''re for certain he''ll get a scolding, but to your dismay, Mr. Yenotin starts joking with Lesco instead. He shares an embarrassing story about how the same thing happened to him once except there were no phones at his time but notes instead. No one is buying his story and instead are focusing their attention on the gopnik clique. They''re laughing loudly, wondering what Lesco was doing when he fell.'
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -309,7 +311,6 @@ if $ARGS[0] = 'russian':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 	end
 	
 !!The actions from before lead to the teacher telling your mother about you mouthing off at the parents conference
@@ -547,6 +548,9 @@ if $ARGS[0] = 'geography':
 		'That comes to an abrupt end when a bang from the front desk that nearly startles you out of your chair.'
 		'Without any hesitation, Mrs. Sokoloff starts shouting at Vitek that''s fast asleep. Her eyes sharpen as she approaches his desk. She slams her hand on his table while Vitek struggles to act nonchalant as he works to quickly return to his senses.'
 		'Mrs. Sokoloff scowls at him, and is about to offer a few stern words when the bell rings. He''ll likely get a talking to, but as class is over, you won''t get to listen in. One of the girls whispers that Vitek is in deep trouble now.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -809,7 +813,6 @@ if $ARGS[0] = 'geography':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 	end
 	
 	act'Daydream':
@@ -1049,6 +1052,9 @@ if $ARGS[0] = 'history':
 		'That comes to an abrupt end when a bang from the front desk that nearly startles you out of your chair.'
 		'Without any hesitation, Mrs. Sokoloff starts shouting at Vitek that''s fast asleep. Her eyes sharpen as she approaches his desk. She slams her hand on his table while Vitek struggles to act nonchalant as he works to quickly return to his senses.'
 		'Mrs. Sokoloff scowls at him, and is about to offer a few stern words when the bell rings. He''ll likely get a talking to, but as class is over, you won''t get to listen in. One of the girls whipsers that Vitek is in deep trouble now.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -1311,7 +1317,6 @@ if $ARGS[0] = 'history':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 	end
 	
 	act 'Daydream':

+ 12 - 4
locations/gschool_lessons2.qsrc

@@ -51,6 +51,9 @@ if $ARGS[0] = 'computer':
 		pcs_grades -= rand(0,1)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 		'You quickly grow bored with the class and instead spend most of the time trying to browse the internet while Mr. Ivanov is busy or pay attention to your fellow students and what they are up to. You can see several of them seem to have the same idea as you do. The only times you pay attention is when he calls on you to answer one of the questions.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -312,7 +315,6 @@ if $ARGS[0] = 'computer':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end	
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 	end
 	
 	act'Daydream':
@@ -560,6 +562,9 @@ if $ARGS[0] = 'science':
 		pcs_grades -= rand(0,1)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 		'You quickly grow bored with the class and instead spend most of the time trying to browse the internet while Miss Orlov is busy or pay attention to your fellow students and what they are up to. You can see several of them seem to have the same idea as you do. The only times you pay attention is when she calls on you to answer one of the questions.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -722,7 +727,6 @@ if $ARGS[0] = 'science':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 	end
 	
 	act'Daydream':
@@ -953,6 +957,9 @@ if $ARGS[0] = 'music':
 		pcs_grades -= rand(0,1)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classmusic.jpg"></center>'
 		'Mr. Vasilyev has go on one of his epically long indepth explanations about one of the music styles and how it influenced society in all sorts of ways and in return was influenced by current events. You thought this was about music not history.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -1215,7 +1222,6 @@ if $ARGS[0] = 'music':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 	end
 	
 	act'Daydream':
@@ -1440,6 +1446,9 @@ if $ARGS[0] = 'biology':
 		pcs_grades -= rand(0,1)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 		'You quickly grow bored with the class and instead spend most of the time trying to browse the internet while Miss Orlov is busy or pay attention to your fellow students and what they are up to. You can see several of them seem to have the same idea as you do. The only times you pay attention is when she calls on you to answer one of the questions.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -1602,7 +1611,6 @@ if $ARGS[0] = 'biology':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 	end
 	
 	act'Daydream':

+ 5 - 2
locations/gschool_lessons3.qsrc

@@ -552,6 +552,9 @@ if $ARGS[0] = 'art':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 			'Mr. Vasilyev has gone on one of his epically long indepth explanations about one of the art styles and how it influenced society in all sorts of ways and in return was influenced by current events. You thought this was about art not history.'
+			
+			act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
+			
 			act 'Draw dick in margin':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -814,7 +817,6 @@ if $ARGS[0] = 'art':
 					act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 		end
 	end
 	
@@ -1083,7 +1085,9 @@ if $ARGS[0] = 'shop':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 			'Mr. Kuznetsov''s is lecturing on safety, but it keeps getting more and more boring. You look around for something to pass the time, desperate for any kid of distraction.'
+			
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
+			
 			act 'Draw dick in margin':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -1346,7 +1350,6 @@ if $ARGS[0] = 'shop':
 					act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 		end
 	end
 	

+ 3 - 1
locations/gschool_lessonsev1.qsrc

@@ -1098,11 +1098,13 @@ if $ARGS[0] = 'computer':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/alyrage2.jpg"></center>'
 				'He fumes. "That''s enough young lady. I''m taking you to the principal''s office." he says as he starts walking torwards her, but she grabs a chair and violently yells at him. "I will bash your fucking head in with this chair if you even dare try to touch me asshole!" This causes him to stop and take a step back, the whole class is stunned by this. Alyona is known to have a violent streak, but normally she spends most of her time sleeping in class.'
+				
 				act 'Keep watching':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/alyrage3.jpg"></center>'
 					'Mr Ivanov somewhat calmly says "Fine I won''t touch you, but you are going to the principal''s office." She screams and throws the chair across the room into the wall, then in a much more calm tone says. "Fine, whatever, let''s go." She heads out of class with Mr. Ivanov trailing behind her. Once they are gone, everyone starts talking about what just happened and sending texts on their phones. Neither of them return to class before the bell rings.'
-					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+					
+					act 'Leave the classroom': gt 'gschool_lessons', 'short_break'
 				end
 			end
 		elseif scooltiperand = 19:

+ 1 - 1
locations/gschool_lessonsev3.qsrc

@@ -1272,7 +1272,7 @@ if $ARGS[0] = 'art':
 				else
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_2.jpg"></center>'
 					'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself, "Damn, I''ll have to take a closer look into that after classes are over!"'
-					gs 'arousal', 'voyeur', 2, 'lesbian'
+					gs 'arousal', 'voyeur', 2
 				end
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else

+ 2 - 0
locations/gschool_lunch.qsrc

@@ -101,6 +101,8 @@ end
 
 if $ARGS[0] = 'break':
 	*clr & cla
+	$loc = 'gschool_lunch'
+	$metka = 'break'
 	$menu_loc = 'gschool_lunch'
 	$menu_arg = 'break'
 	$location_type = 'public_indoors'

+ 79 - 83
locations/gschool_socialchg1.qsrc

@@ -1,13 +1,28 @@
 # gschool_socialchg1
 
+!!all those events need to be restricted to once per day socialchg['eventname_day'] = daystart
+
 if $ARGS[0] = 'tLazar':
 	cla & *clr
 	menu_off = 1
+	socialchg['tLazar_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 	'You decide on to walk over to see what the fuss is about. As usual Lazar is showing off his skills as he has some of the younger kids challenge him 1-on-1 or even 1-on-2 and he''s still managing to beat them quite easily.'
-	'As you step on the field he waves to you to come over before he kicks the ball further away so that the younger kids go chasing after it.'
-	act 'Walk over':
+	'As you step on the field he waves to you to come over before he kicks the ball further away so that the younger kids go chasing after it. You stop in your tracks as you see your brother being one of the kids chasing the ball that Lazar kicked away and you know he would do anything to embarrass you in front of him.'
+	
+	act 'Run away':
+		cla & *clr
+		minut += 10
+		npc_rel['A149'] -= 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
+		'While blushing you quickly make a signal to Lazar that you have to run and quickly turn your back before Kolka notices you being there.'
+		'Lazar is standing there a bit dumbfounded, wondering why you suddenly had a change of heart but shrugs it off and quickly yells to the kids who''s next to challenge him.'
+		act 'Run back to the school grounds': gt 'gschool_grounds', 'main'
+	end
+	
+	act 'Walk over to him':
 		cla & *clr
 		minut += 10
 		gs 'stat'
@@ -139,17 +154,6 @@ if $ARGS[0] = 'tLazar':
 			end
 		end
 	end
-	act 'Run away':
-		cla & *clr
-		minut += 10
-		npc_rel['A149'] -= 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
-		'You stop in your tracks as you see your brother being one of the kids chasing the ball that Lazar kicked away and you know he would do anything to embarrass you in front of him.'
-		'While blushing you quickly make a signal to Lazar that you have to run and quickly turn your back before Kolka notices you being there.'
-		'Lazar is standing there a bit dumbfounded, wondering why you suddenly had a change of heart but shrugs it off and quickly yells to the kids who''s next to challenge him.'
-		act 'Run back to the school grounds': gt 'gschool_grounds', 'main'
-	end
 end
 
 if $ARGS[0] = 'lazar_vaginal':
@@ -352,16 +356,14 @@ if $ARGS[0] = 'ivanfedor_threesome':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some1.jpg"></center>'
 	'The three of you walk further down the beach past the sauna where almost no one ever goes. Just around a bend in the shore to block the view from the rest of the beach, and the park forest further down. Once the three of you are sure no one else is around the boys start stripping off their clothes, while you drop down to your knees between them. You take both their cocks in your hands and start stroke them until you get them both rock hard.'
 	gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
-	gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
-	minut -= 5
+	gs 'arousal', 'hj', -5, 'group', 'exhibitionism'
 	gs 'stat'
 	act 'Suck them':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some2.jpg"></center>'
 		'Once they are both hard, you take Ivan''s cock into your mouth and start sucking it while you keep stroking it with your hand. You use your other hand to keep stroking Fedor''s dick. After a couple of minutes you switch cocks and start sucking on Fedor''s dick instead. The boys give each other a high five above your head.'
 		gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
-		gs 'arousal', 'bj', 5, 'group', 'exhibitionism'
-		minut -= 5
+		gs 'arousal', 'bj', -5, 'group', 'exhibitionism'
 		gs 'stat'
 		act 'Switch cocks':
 			cla & *clr
@@ -369,8 +371,7 @@ if $ARGS[0] = 'ivanfedor_threesome':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some3.jpg"></center>'
 			'Once switch back to sucking on Ivan''s cock, Fedor steps away from you a moment. Then he bends over and takes hold of your hips and pulls you up. You keep sucking on Ivan''s cock, which forces you to bend over as Fedor pulls you up into a standing position. Which you are sure that is exactly what he wanted and he steps behind you at once. He rubs your clit a few times to get your a little wet, before he rubs the tip of his dick against your slit. Once he is sure you are wet enough he pushes his <<dick>>cm <<$dick_girth>> dick inside your pussy, stretching and filling it out. He slowly fucks you, steadily going a little deeper with each stroke, while you suck on Ivan''s cock.'
 			gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
-			gs 'arousal', 'bj', 5, 'group', 'exhibitionism'
-			minut -= 5
+			gs 'arousal', 'bj', -5, 'group', 'exhibitionism'
 			gs 'stat'
 			act 'DP time':
 				cla & *clr
@@ -380,16 +381,14 @@ if $ARGS[0] = 'ivanfedor_threesome':
 				'Fedor pulls out of you and lays down on his back and the boys guide you down onto Fedor, Ivan fingers you a little bit until he gets his fingers nice and wet and then he smears your wetness on his dick. You are lowered down onto Fedor and you feel his cock easily sliding back inside of your pussy. Ivan kneels down behind you and spits on your ass and rubs his spit against your asshole, he repeats it a couple of times until your asshole is nice and wet with his spit. You feel the tip of his dick pressing against your butthole, building up into the head of his dick pops in your ass. Ivan starts slowly fucking your ass being as gentle as he can while you get use to his <<dick>>cm <<$dick_girth>> dick filling your butt.'
 				anal_slip += 4
 				gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
-				gs 'arousal', 'anal', 5, 'group', 'exhibitionism'
-				minut -= 5
+				gs 'arousal', 'anal', -5, 'group', 'exhibitionism'
 				gs 'stat'
 				act 'Double the fun':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some5.jpg"></center>'
 					'Ivan grabs your hips and holds them in place while Fedor thrusts into your twat from beneath you, while Ivan pounds your little asshole. It hurt a little at first but now the pleasure of both your holes filling this full over takes any pain you felt and replaces it with pleasure. You find yourself moaning louder and louder as the boys fuck both your holes.'
 					gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
-					gs 'arousal', 'anal', 5, 'group', 'exhibitionism'
-					minut -= 5
+					gs 'arousal', 'anal', -5, 'group', 'exhibitionism'
 					gs 'stat'
 					act 'Cum on my titties':
 						cla & *clr
@@ -414,6 +413,7 @@ end
 if $ARGS[0] = 'tSvyatoslav':
 	cla & *clr
 	menu_off = 1
+	socialchg['tSvyatoslav_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></center>'
 	'You wait patiently until Svyatoslav ends one of his runs. "You''re improving greatly," You complement him.'
@@ -446,6 +446,7 @@ end
 if $ARGS[0] = 'tVanya':
 	cla & *clr
 	menu_off = 1
+	socialchg['tVanya_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big165.jpg"></center>'
 	'Seeing you he stops in his tracks, "Hey, <<$pcs_nickname>>, you''re out early today!" he gives you a subtle smile.'
@@ -505,6 +506,7 @@ end
 if $ARGS[0] = 'tChristina':
 	cla & *clr
 	menu_off = 1
+	socialchg['tChristina_day'] = daystart
 	gs 'stat'
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
@@ -544,7 +546,7 @@ if $ARGS[0] = 'tChristina':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
 		'"What are the two of you up to?" you ask Christina ignoring Lina as you walk up to them.'
 		'"I''m trying to get this lazy ass to perform better..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks. "I am going to send these to everyone, they are going to love seeing these."'
-		act 'Run off': christinaphotos = daystart & gt 'gLake'
+		act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
 		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 	end
 end
@@ -552,6 +554,7 @@ end
 if $ARGS[0] = 'tLina':
 	cla & *clr
 	menu_off = 1
+	socialchg['tLina_day'] = daystart
 	gs 'stat'
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
@@ -584,19 +587,16 @@ if $ARGS[0] = 'tLina':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
 		'"What are you two up to?" you ask Lina ignoring Christina as you walk up to them.'
 		'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?!..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks. "I am going to send these to everyone, they are going to love seeing these."'
-		gs 'willpower', 'crime', 'self', 'medium'
-!!I picked crime because it is assault unless there is a better one
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Kick her ass (<<will_cost>> Willpower)':
-				*clr & cla
 				gs 'willpower', 'pay', 'self'
-				gs 'stat'
 				gt 'gschool_socialchg1', 'christina_fight'
 			end
 		else
 			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	
-		act 'Run off': christinaphotos = daystart & gt 'gLake'
+		act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
 		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 	end
 end
@@ -612,53 +612,45 @@ if $ARGS[0] = 'chrislina_naked':
 	'She suddenly bursts out laughing, pointing at you, and walks towards you. Lina is confused a moment and then she realizes what Christina is laughing at and joins in as she follows Christina over. "Don''t you have any shame, you fucking slut?"'
 	'"Yeah." Lina adds kinda half heartedly, you think she is just doing it to make Christina happy.'
 	'Christina looks you over head to toe with a look of disgust on her face. "Maybe this is the only way you can get guys to even look at you, hag."'
-	act 'I made a mistake':
-		cla & *clr
-		gs 'stat'
+	
+	act 'I made a mistake': christina_temp = 0 & gt 'gschool_socialchg1', 'christina_decision'	
+	act 'I''m not ashamed': christina_temp = 1 & gt 'gschool_socialchg1', 'christina_decision'
+end
+
+if $ARGS[0] = 'christina_decision':
+	cla & *clr
+	minut += 2
+	gs 'stat'	
+	
+	if christina_temp = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
 		'Hearing the girls laugh and Christina''s stinging words you blush and cover yourself up as best you can. "I... I made a mistake. I don''t know what I was thinking. Please don''t tell anyone." You beg.'
-		'Christina pulls out her phone and starts taking pictures of you with her phone as she talks. "Yeah you make a mistake you stupid cunt and now your going to pay for it. I am going to send these to everyone, they are going to love seeing these." You start to panic as you realize what this means, this might ruin your reputation, while Christina keeps taking your picture.'
-		gs 'willpower', 'crime', 'self', 'medium'
-!!I picked crime because it is assault unless there is a better one
-		if will_cost <= pcs_willpwr:
-			act 'Kick her ass (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'self'
-				gs 'stat'
-				gt 'gschool_socialchg1', 'christina_fight'
-			end
-		else
-			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
-		act 'Run off': christinaphotos = daystart & gt 'gLake'
-		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
-	end
-	act 'I''m not ashamed':
-		cla & *clr
-		gs 'stat'
+		'Christina pulls out her phone and starts taking pictures of you with her phone as she talks. "Yeah you make a mistake you stupid cunt and now your going to pay for it. I am going to send these to everyone, they are going to love seeing these." You start to panic as you realize what this means, this might ruin your reputation, while Christina keeps taking your picture.'	
+	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
 		'Hearing the girls laugh and Christina''s words you shake your head and don''t cover up, you know you have nothing to be ashamed of. "I have nothing to be ashamed of. This is how I was made and I look amazing, just because you are ashamed of your body Christina, doesn''t mean I am." You tell her with a sneer.'
 		'Christina''s jaw tightens and her eyes narrow in obvious anger as she pulls out her phone and starts taking pictures of you with her phone as she talks. "No? Well then you won''t mind if I take your picture and send to everyone then right? They are going to love seeing these." Your confidence wavers a little, despite not being ashamed you do realize what this means, this might ruin your reputation.'
-		gs 'willpower', 'crime', 'self', 'medium'
-!!I picked crime because it is assault unless there is a better one
-		if will_cost <= pcs_willpwr:
-			act 'Kick her ass (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'self'
-				gs 'stat'
-				gt 'gschool_socialchg1', 'christina_fight'
-			end
-		else
-			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
-		act 'Run off': christinaphotos = daystart & gt 'gLake'
-		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 	end
+	
+	killvar 'christina_temp'
+	
+	gs 'willpower', 'misc', 'self', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'Kick her ass (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'self'
+			gt 'gschool_socialchg1', 'christina_fight'
+		end
+	else
+		act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
+	act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
+	act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 end
 	
 if $ARGS[0] = 'beg_christina':
 	cla & *clr
 	menu_off = 1
+	socialchg['christina_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
 	'Panic sets in as you try and cover yourself up as best you can. Maybe you can convince her not to send the pictures to everyone. "Please Christina, don''t send those pictures, please?" You beg her.'
@@ -666,13 +658,11 @@ if $ARGS[0] = 'beg_christina':
 	'You are a bit confused, own you? "Own me?" You ask.'
 	'Christina snarls at you. "Yeah that''s right bitch I will own you, I tell you to do my homework you will, if I tell you to lick my shoes clean you will, if I tell you to stick a bottle up your ass you will, got it?"'
 	'You feel the blood drain from your face as you realize she means it and will likely torment you for the rest of the school year, but it will save your reputation.'
-!!I went with misc on this one cause nothing else seemed to fit
 	gs 'willpower', 'misc', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
 			*clr & cla
 			gs 'willpower', 'pay', 'resist'
-			christinaphotos = daystart
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
 			'You shake your head no. "No I''m not going to do that, you will humiliate me worse than those photos every would."'
@@ -682,11 +672,12 @@ if $ARGS[0] = 'beg_christina':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end	
+	
 	act 'Agree':
 		cla & *clr
-		mood -= 10
-!! check with nutluck about post PE scenes
-		christinaphotos = 1
+		pcs_mood -= 10
+		christinaphotos = 1		
+		gs 'pain', 1, 'labia', 'kick'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/onall4s.jpg"></center>'
 		'You reluctantly nod your head and meekly agree. "Ok." You tell her.'
@@ -696,7 +687,7 @@ if $ARGS[0] = 'beg_christina':
 		'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
 		*nl
 		'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
-		gs 'pain', 1, 'labia', 'kick'
+		
 		act 'Walk off': gt 'gLake'
 	end
 end
@@ -707,7 +698,8 @@ if $ARGS[0] = 'christina_fight':
 	gs 'stat'
 	'You step closer to Christina and say. "Give me the fucking phone before I kick you ass."'
 	'She smirks to you and puts her phone in her pocket and gets in fighting stance obviously more than willing to fight you. "Take if you think you can cunt!" Lina moves out of the way to watch, just as you take your first swing. Which Christina was waiting for and easily side steps your first blow, but now the fight is on.'
-	act 'fight':
+	
+	act 'Fight her':
 		gs 'fight','initFight'
 		gs 'fight_npcdata', 'christina'
 		fightEnding = 15
@@ -723,6 +715,7 @@ if $ARGS[0] = 'tBella':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
 	'You approach her and tap her on her shoulder, "Hi, Bella! You''re heading into the city?" you ask.'
 	'Sighing, Bella replies, "Yeah, I''m meeting some of my older friends in town. There''s a new gym opening so we though we might check it out."'
+	
 	act 'Sounds amazing':
 		cla & *clr
 		npc_rel['A22'] += 2
@@ -734,6 +727,7 @@ if $ARGS[0] = 'tBella':
 		'"Oh, the stories I''ve got to tell..." Bella replies but before she can continue on there''s an announcement and she excuses herself saying that''s the train she needs to catch.'
 		act 'Return to the train station': gt 'pavtrainhall'
 	end
+	
 	act 'What''s wrong with the gym in Pavlovsk?':
 		cla & *clr
 		npc_rel['A22'] -= 2
@@ -762,17 +756,7 @@ if $ARGS[0] = 'tVeronika':
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 		'"Hi, Veronika!" you shout out, "Looking great out there!"'
 		'Ice cold with a blank expression, she stops in front of you, "What do you want? Can''t you see that I''m practicing?"'
-		act 'Encourage':
-			cla & *clr
-			npc_rel['A141'] += 2
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
-			'"I just wanted to say that you''re looking great out there." You smile, "I bet you''ll have no issues getting on the Russian team."'
-			'Veronika, still stone faced and rigid, replies a bit reluctantly. "Thanks, I guess. I do train a lot to succeed so I can leave this god forsaken hole..."'
-			'You awkwardly smile, "I know what you mean. It really is a dump isn''t it?"'
-			'"If there wasn''t anything more I need to get back to my training..." she replies. Before you''re able to answer back, Veronika is already skating away from you...'
-			act 'Walk away': gt 'gLake'
-		end
+
 		act 'Discourage':
 			cla & *clr
 			npc_rel['A141'] -= 2
@@ -785,6 +769,18 @@ if $ARGS[0] = 'tVeronika':
 			'Stone cold Veronika only shrugs her shoulders, turning around and skates away like the two of you never had a conversation...'
 			act 'Walk away': gt 'gLake'
 		end
+		
+		act 'Encourage':
+			cla & *clr
+			npc_rel['A141'] += 2
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
+			'"I just wanted to say that you''re looking great out there." You smile, "I bet you''ll have no issues getting on the Russian team."'
+			'Veronika, still stone faced and rigid, replies a bit reluctantly. "Thanks, I guess. I do train a lot to succeed so I can leave this god forsaken hole..."'
+			'You awkwardly smile, "I know what you mean. It really is a dump isn''t it?"'
+			'"If there wasn''t anything more I need to get back to my training..." she replies. Before you''re able to answer back, Veronika is already skating away from you...'
+			act 'Walk away': gt 'gLake'
+		end
 	end
 end
 

+ 1 - 1
locations/gskver.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'start':
 		act 'Go and see Rex':gt 'reks', 'skver'
 	end
 
-	if week >= 6 and hour >= 8 and hour <= 9 and StoryLine = 1: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
+	if week >= 6 and hour >= 8 and hour <= 9 and StoryLine = 1 and socialchg['tVanya_day'] ! daystart: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
 
 	act 'Go for a walk (0:15)':
 		menu_off = 1

+ 1 - 1
locations/kafesvid.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = '1':
 	'The cafe is pretty empty, and you are in the far corner, where it is kind of dark. <<$telsob>> uses this little bit of privacy to slowly hike up her shirt. When she notices you staring, she puts a leg up right between your thighs. It gives you an excellent view of her already wet panties.'
 	'"Like what you see, <<$pcs_nickname>>?" she says, with a wicked grin.'
 
-	gs 'arousal', 'voyeur', 5, 'lesbian'
+	gs 'arousal', 'voyeur', 5
 	gs 'stat'
 	gs 'willpower', 'foreplay', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:

+ 5 - 7
locations/sister.qsrc

@@ -430,7 +430,7 @@ if $ARGS[0] = 'scene1':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_3.jpg"></center>'
 				'You turn down the invitation.'
 				'"Sorry Roma, I would love to, but I can''t get behind at school. I have homework and books to read, you know what it''s like."'
-				act 'Finish':SiSgdk = 0 & gt 'sister'
+				act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 			end
 			if razradbeg > 0:
 				act 'No (training)':
@@ -439,7 +439,7 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_4.jpg"></center>'
 					'You turn down the invitation.'
 					'"I would love to, but I have a competition to prepare for. I have to train."'
-					act 'Finish':SiSgdk = 0 & gt 'sister'
+					act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 				end
 			end
 			if volleysostav = 1 or volleysostav = 2:
@@ -449,19 +449,17 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_5.jpg"></center>'
 					'You turn down the invitation.'
 					'"I can''t, the coach does not allow my to stay out late, and drinking is also prohibited."'
-					act 'Finish':SiSgdk = 0 & gt 'sister'
+					act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 				end
 			end
 			act 'Yes':
 				sisterQW['party'] = 1
 				*clr & cla
-				!! Sicaa: This image seems wrong, given that doing anything lesbian with your sister is no longer necessary for the party. Changing it to a different picture as a temporary measure
-				!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_2.jpg"></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_03.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 				'You agree to go to the party.'
 				'"Awesome <<$pcs_nickname>>, it''ll be fun. We will meet here, don''t forget to be there before 18:00, otherwise we will leave without you."'
 				'Anya gives Roma a dirty look, but he just shrugs it off.'
-				act 'Finish':SiSgdk = 0 & gt 'sister'
+				act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 			end
 		end
 	end

+ 1 - 1
locations/traits.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'menu':
 	
 	if traits['nerd_status'] = 0:
 		'<center><b>Likes learning</b></center>'
-		'You don''t have this trait and <<traits[''nerd_points'']>> points. You need to earn '+iif(traits['nerd_points'] > 0, '<<40 - traits[''nerd_points'']>>', '<<40 + traits[''nerd_points'']>>')+' more points to get level 1 of this trait.'
+		'You don''t have this trait and <<traits[''nerd_points'']>> points. You need to earn <<40 - traits[''nerd_points'']>> more points to get level 1 of this trait.'
 	elseif traits['nerd_status'] = 1:
 		'<center><b>Likes learning</b></center>'
 		'You have level 1 of this trait and <<traits[''nerd_points'']>> points. You need to earn <<60 - traits[''nerd_points'']>> more points to get level 2 of this trait. If you fall below 20 points, you''ll lose this trait.'