[fixes] for the school and church

locations/ParChurch.qsrc

@@ -20,6 +20,7 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	$location_type = 'public_indoors'
 	menu_off = 0
+	gs 'themes', 'outdoors'
 	gs 'stat'
 	'<center><b><font color="maroon">Church of Saint Nikolas</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/st-nikolas.jpg"></center>'
@@ -68,6 +69,7 @@ if $ARGS[0] = 'vigil':
 	moral += 1
 	Churchbad -= 1
 	minut += 30
+	gs 'themes', 'indoors'
 	PLAY 'sound/church/Blessing.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,5) +'.jpg"></center>'
 	'You attend the vigil and reflect on the recent events in your life. The harmonies as the hymns and psalms are sung sweep aside some of the worries in your heart, although you know they will return once you leave this holy place, you still enjoy the rest. The sweet scent of incense tickles your nose and reminds you of the scent of' + iif(rex_love = 1, 'Rex', 'your step-father') + '''s cologne.'  
@@ -104,6 +106,7 @@ if $ARGS[0] = 'liturgy':
 	menu_off = 1
 	minut += 60
 	Churchbad -= 1
+	gs 'themes', 'indoors'
 	PLAY 'sound/church/t' + rand(1,19) + '.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,8) +'.jpg"></center>'
 	if pav_slut < 75 and Conf_Kirill <= 1: 
@@ -156,6 +159,7 @@ if $ARGS[0] = 'Narthex':
 	$menu_arg = 'Narthex'
 	menu_off = 0
 	*clr & cla
+	gs 'themes', 'indoors'
 	gs 'stat'
 	PLAY 'sound/church/76139__dkustic__090227-01-people-church-concert.wav',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/enterchurch.jpg"></center>'
@@ -174,6 +178,7 @@ if $ARGS[0] = 'candle':
 	minut += 10
 	menu_off = 1
 	Churchbad -= 1
+	gs 'themes', 'indoors'
 	gs 'stat'
 	gs 'ParChurch', 'reducepavrep', 25, -1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_candle.jpg"></center>'
@@ -209,6 +214,8 @@ if $ARGS[0] = 'pray':
 	*clr & cla
 	menu_off = 1
 	minut += 1
+	gs 'themes', 'indoors'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_praying.jpg"></center>'
 	'You approach the prayer bench and kneel down to pray.'
 	act 'Pray':
@@ -291,6 +298,7 @@ if $ARGS[0] = 'talk_priest':
 	*clr & cla
 	menu_off = 1
 	minut += 15
+	gs 'themes', 'indoors'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_talk.jpg"></center>'
 	'As you approach the priest, you recall your previous behavior, your sins, your transgressions, and the daily temptations you face.'

locations/gschool_break.qsrc

@@ -498,6 +498,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			end
 			if grupTipe = 1 or grupTipe = 2 or grupTipe = 4:
 				act 'Say "What a fucking slut!"':
+					*clr & cla
 					npc_rel['A25'] -= 5
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/soniabj.mp4"></video></center>'
 					'Undaunted in the face of such shameless debauchery, you continue with your business and go straight to the sink. While you lather your hands in soap you turn to face the two of them and say: "God you are such a fucking slut, do your knee''s have calluses on them from all the kneeling you do?"'
@@ -513,6 +514,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			end
 			
 			act 'Say "Hi"':
+				*clr & cla
 				npc_rel['A25'] += 3
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/soniabj.mp4"></video></center>'
 				'Undaunted in the face of such shameless debauchery, you continue with your business and go straight to the sink. While you lather your hands in soap you turn to face the two of them and say: "Hi Sonia! Having fun on your ''date?''"'

locations/gschool_chats.qsrc

@@ -3,7 +3,8 @@
 if $ARGS[0] = 'nerds':
 	*clr & cla
 	minut += 5
-	if rand(1,6) = 1 and pcs_vag > 12 and mesec <= 0 and gschool_ignore = 0:
+	if rand(1,6) = 1 and pcs_vag > 12 and mesec <= 0 and gschool_ignore = 0 and gschool_gropeday ! daystart:
+		gschool_gropeday = daystart
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boysex_tualet.jpg"></center>'
 		*nl
 		'When you enter the class, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.'

locations/gschool_lessonsev1.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'fiz_rand':
 		gs 'exhibitionism', 1
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand1.jpg"></center>'
-		'You''re not wearing panties, and while you''re doing your pullups your shorts slide down a little. Now, the top of your pubes are on display for the whole class to see. It''s met with mixed responses: the guys are whistling and whooping appreciatively, while most of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
+		'You''re not wearing panties, and while you''re doing your pullups your shorts slide down a little. Now, the top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with mixed responses: the guys are whistling and whooping appreciatively, while most of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
 	elseif fizperand = 2 and hotcat >= 6:
 		*clr & cla
 		pcs_horny += 10

locations/gschool_lunch.qsrc

@@ -119,6 +119,8 @@ if $ARGS[0] = 'break':
 	'During break many of the kids split up to hang out with those in their same social groups. The nerds and outcast hangout in the classrooms, while the cool kids and jocks hang out in the hallway near the lockers, and the gopniks hangout in the stairwell, near the classrooms that are not used.'
 	cla
 	
+	$eventtype = 'long_break'
+	
 	if $breaktype ! 'long':	
 		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat did you happen to see Dimka?" "Hi <<$pcs_nickname>>, he was here before speaking with Lena and Lera.'
 	
@@ -160,7 +162,6 @@ if $ARGS[0] = 'break':
 		else
 			if breakevent_break_day ! daystart:
 				breakevent_break_day = daystart
-				$eventtype = 'long_break'
 				gt 'gschool_events', 'break_events'
 			end
 			

locations/gschool_sex.qsrc

@@ -418,6 +418,7 @@ if $ARGS[0] = 'Anush_kiss':
 			gs 'arousal', 'bj', 10, 'group'
 			gs 'boystat', 'A156'
 			gs 'arousal', 'bj', 10, 'group'
+			minut -= 10
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
@@ -425,6 +426,7 @@ if $ARGS[0] = 'Anush_kiss':
 				'Anushka stops and pulls you up as she stands up. "Ok boys it''s our turn." The boys waste no time in taking off your clothes as you and Anushka start making out again, once your both naked the buys kneel down and start eating you out. The even return the favor of switching, which pussy they are licking.'
 				gs 'arousal', 'kiss', 10, 'lesbian'
 				gs 'arousal', 'cuni', 10, 'group'
+				minut -= 10
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
@@ -437,6 +439,7 @@ if $ARGS[0] = 'Anush_kiss':
 					gs 'arousal', 'vaginal', 10, 'group'
 					gs 'boystat', 'A158'
 					gs 'arousal', 'vaginal', 10, 'group'
+					minut -= 10
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
@@ -452,6 +455,7 @@ if $ARGS[0] = 'Anush_kiss':
 						gs 'arousal', 'anal', 10, 'group'
 						gs 'boystat', 'A156'
 						gs 'arousal', 'anal', 10, 'group'
+						minut -= 10
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
@@ -475,7 +479,7 @@ if $ARGS[0] = 'rand_bj':
 	*clr & cla
 	menu_off = 1
 	pcs_horny += 50
-	gs'stat'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet2.jpg"></center>'
 	'You can''t believe you''re doing this! Minutes ago you were just looking to relax in the classroom between lessons, and now you''re about to give this guy the best blowjob he''s ever had, in front of all your classmates that''s so hot!'
 	'You impatiently undo the button on his pants and dig your hand in, surely enough finding a hard dick waiting for you. You scoot his pants down a bit and pull it out, giving it a little kiss as you drop to your knees.'
@@ -565,7 +569,7 @@ if $ARGS[0] = 'rand_sex':
 				*nl
 				'After he admires his handiwork for a second, he notices the time, "Oh crap! <<$pcs_nickname>>, we''re going to be late for class!"'
 				'You both get dressed as quickly as you can, and run as fast as you can to make it to class on time.'
-				act 'Continue': gt 'gschool_lessons', 'short_break'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
 			end
 		end
 		act 'He fucks your ass':
@@ -601,7 +605,7 @@ if $ARGS[0] = 'rand_sex':
 					gs 'arousal', 'anal', 10, 'unknown'
 					gs 'arousal', 'end'
 					gs'stat'
-					act 'Continue': gt 'gschool_lessons', 'short_break'
+					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 				end
 			end
 		end
@@ -629,17 +633,7 @@ if $ARGS[0] = 'lunch_bj':
 			'He doesn''t last long; within a few minutes you feel his cum squirting in your mouth. You quietly swallow it all and release his cock, giving it a cute kiss before letting him tuck it back into his pants. "Oh my god! that was great <<$pcs_nickname>>, you really know how to suck cock. Thanks I really needed that, don''t worry I won''t tell anyone." He says with a wink and gives you a quick kiss, before he hurries out of the bathroom. After he leaves you take a moment to check yourself out in the mirror, making sure your hair and makeup is good. As you leave, you can''t help but feel good about giving the guy a day at school he will likely never forget.'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Continue':
-				if $eventtype = 'before_school':
-					gt 'gschool_lessons', 'morning'
-				elseif $eventtype = 'lunch':
-					gt 'gschool_lunch', 'lunch'
-				elseif $eventtype = 'long_break':
-					gt 'gschool_lunch', 'break'
-				elseif $eventtype = 'after_school':
-					gt 'gschool_lunch', 'main'
-				end
-			end
+			act 'Continue': gt 'gschool_events', 'leave_break_events2'
 		end
 	end
 end
@@ -704,17 +698,7 @@ if $ARGS[0] = 'lunch_sex2':
 	'He stands up and starts jerking his dick, you kneel in front of him and open your mouth, within a few minutes you feel his cum squirting in your mouth. You quickly swallow it all. "Oh my god! that was great <<$pcs_nickname>>, you really know how to fuck. Thanks I really needed that, don''t worry I won''t tell anyone." He says with a wink and gives you a quick kiss, before he quickly gets dressed and hurries off the roof. After he leaves you take a moment to check yourself out, after getting dressed, making sure your hair and makeup is good. As you leave, you can''t help but feel good about giving the guy a day at school he will likely never forget.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Continue':
-		if $eventtype = 'before_school':
-			gt 'gschool_lessons', 'morning'
-		elseif $eventtype = 'lunch':
-			gt 'gschool_lunch', 'lunch'
-		elseif $eventtype = 'long_break':
-			gt 'gschool_lunch', 'break'
-		elseif $eventtype = 'after_school':
-			gt 'gschool_lunch', 'main'
-		end
-	end
+	act 'Continue': gt 'gschool_events', 'leave_break_events2'
 end
 
 --- gschool_sex ---------------------------------

locations/pavComplex.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 		end
 	end	
 
-	if week = 1 or week = 3 or week = 5 and hour >= 17 and hour <= 19 and Storyline > 0: 'Walking along the apartment complex you can hear a bouncing sound. Turning the corner you see <a href="exec:gt ''gschool_socialchg1'', ''tLariska''">Lariska</a> hitting a ball against the wall...'
+	if (week = 1 or week = 3 or week = 5) and hour >= 17 and hour <= 19 and Storyline > 0: 'Walking along the apartment complex you can hear a bouncing sound. Turning the corner you see <a href="exec:gt ''gschool_socialchg1'', ''tLariska''">Lariska</a> hitting a ball against the wall...'
 	
 	if car > 0 and cardrive = 20: 'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked in the street.'
 	

locations/pavIndustrial.qsrc

@@ -45,7 +45,7 @@ end
 'First shift - 08:00 to 16:00'
 'Second shift - 16:00 to 20:00'
 *nl
-'In a smaller building right next to the factory is the local '+iif(week < 7 and hour >= 8 and hour < 18,'<a href="exec: gt ''Gshveyfab'', ''tailor''">', 'tailor')+' shop, a service offered by the factory. Opening hours are Monday to Saturday, between 08:00 to 17:00.'
+'In a smaller building right next to the factory is the local '+iif(week < 7 and hour >= 8 and hour < 18,'<a href="exec: gt ''Gshveyfab'', ''tailor''">tailor</a>', 'tailor')+' shop, a service offered by the factory. Opening hours are Monday to Saturday, between 08:00 to 17:00.'
 
 gs'street_event','pavIndustrial', 'extras'