Merge remote-tracking branch 'Anya/master'

locations/gschool_grounds.qsrc

@@ -731,7 +731,7 @@ if $ARGS[0] = 'change_room':
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lockerroom.jpg"></center>'
 
 	act 'Leave':
 		if $clothingworntype = 'nude':

locations/gschool_post_shower.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'post_shower':
 			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 			act 'Keep checking her out':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/nushwatch2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchnush2.jpg"></center>'
 				if rand (1,4) = 1:
 					if npc_rel['A144'] >= 60:
 						'Perhaps sensing your gaze, Anushka suddenly turns her head over her shoulder and makes direct eye contact with you. You freeze, your eyes growing wide and your mouth going slack as you try to think of some kind of excuse. Before you can say anything, she puts her fingers up to her mouth in a V shape and sticks her tongue between them, the universal sign for eating pussy. She then goes back to pretending like nothing happened, so you turn back to your own locker, blushing a little as you finish getting dressed.'

locations/nyp_school.qsrc

@@ -618,7 +618,7 @@ if $ARGS[0] = 'gopniks':
 			end
 			act 'Tag the locker room':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lockerroom.jpg"></center>'
 				'"Where should we do it?" you ponder for a second before deciding on tagging the gym. "What do you say about the locker room?"'
 				'The others nod while you can see a clear smile on Paulina''s face as you''ve picked her suggestion.'
 				'"Shall we?" you ask. The others nod and you sneak into the boys locker room, where you start searching for the perfect spot.'
@@ -691,7 +691,7 @@ if $ARGS[0] = 'gopniks':
 
 			act 'Head to the girls locker room':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lockerroom.jpg"></center>'
 				'You sneak into the girls locker room and find a bench to sit on, but Arkadi is nowhere to be seen. You look around worried, but Anushka calms you down. "Don''t worry, he''ll be here shortly. He just went to roll the joint."'
 				'You sit and chat for a while waiting for Arkadi and it doesn''t take long before you can see him coming towards you.'
 				'"Took you long enough!" Radomir yells out to him.'
@@ -734,7 +734,7 @@ if $ARGS[0] = 'gopniks':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lockerroom.jpg"></center>'
 						'As Alyona is passing the joint to you, you begin to internally freak out. You shake your head and show with a hand gesture that you pass.'
 						'"What now?" Arkadi asks. "I thought you wanted to smoke?" he irritably says.'
 						'"I''ve changed my mind." you meekly answer.'

locations/uni_lessons.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'short_break':
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Lecture Building Hallway</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/building/lecture_hall.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/lecture_hall/lecture_hall.jpg"></center>'
 	'Walking down the halls, you are still amazed at how well taken care of the buildings are compared to your old school.'
 	gs 'uni_lessons', 'schedule'
 	act 'Go to the university plaza': gt 'uni_grounds', 'main'

locations/uni_lessons1.qsrc

@@ -282,14 +282,14 @@ if $ARGS[0] = 'teaching_methods_101':
 		act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'teaching_methods'
 		act 'Draw dick in margin':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/drawdick.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
 			'You are bored and start doodling, which turns into you drawing dicks, complete with balls, on the margin. You even share your handwork with the girl sitting next to you when she glances over.'
 			act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'teaching_methods'
 		end
 	end
 	act'Daydream':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/sleep.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/sleep<<rand(1,3)>>.jpg"></center>'
 		'Mr. Pasternak is lecturing the class about exotic places around the world. You close your eyes as you start to fantasize about these places.'
 		'You suddenly find yourself standing in front of a group of people with a globe. They tell you that you''re free to spin it and you''ll get to travel whise it stops for free.'
 		*nl
@@ -535,7 +535,7 @@ if $ARGS[0] = 'learning_theories_101':
 		act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'learning_theories'
 		act 'Draw dick in margin':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/drawdick.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
 			'You are bored and start doodling, which turns into you drawing dicks, complete with balls, on the margin. You even share your handwork with the girl sitting next to you when she glances over.'
 			act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'learning_theories'
 		end

locations/uni_lessons2.qsrc

@@ -282,14 +282,14 @@ if $ARGS[0] = 'teaching_methods_102':
 		act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'teaching_methods'
 		act 'Draw dick in margin':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/drawdick.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
 			'You are bored and start doodling, which turns into you drawing dicks, complete with balls, on the margin. You even share your handwork with the girl sitting next to you when she glances over.'
 			act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'teaching_methods'
 		end
 	end
 	act'Daydream':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/sleep.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/sleep<<rand(1,3)>>.jpg"></center>'
 		'Mr. Pasternak is lecturing the class about exotic places around the world. You close your eyes as you start to fantasize about these places.'
 		'You suddenly find yourself standing in front of a group of people with a globe. They tell you that you''re free to spin it and you''ll get to travel whise it stops for free.'
 		*nl
@@ -535,7 +535,7 @@ if $ARGS[0] = 'psychology_of_a_student_101':
 		act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'psychology_of_a_student_101'
 		act 'Draw dick in margin':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/drawdick.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
 			'You are bored and start doodling, which turns into you drawing dicks, complete with balls, on the margin. You even share your handwork with the girl sitting next to you when she glances over.'
 			act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'psychology_of_a_student_101'
 		end