Merge remote-tracking branch 'Anya/master'

locations/uni_grounds.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'main':
 				'The campus is quite lively right now. Most of the students are on their way to the next class, trying not to slip on any icy spots in the courtyard.'
 			end
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_night_winter.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_winter_night.jpg"></center>'
 			'The University boasts a large amount of buildings hosting many different types of classes.'
 			!!night winter desc here
 			if week = 7:

locations/uni_lessons1.qsrc

@@ -212,7 +212,7 @@ if $ARGS[0] = 'general_education_101':
 	end
 	act'Play with your phone':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 		'You take out your phone and begin playing a game, hoping the this boring lesson will be over soon.'
 		playphone = rand(1,2)
 		if playphone = 1:
@@ -229,7 +229,7 @@ if $ARGS[0] = 'general_education_101':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 					'You ignore him and keep using your phone as he just shakes his head and goes back to his lecture.'
 					act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'general_education'
 				end
@@ -466,7 +466,7 @@ if $ARGS[0] = 'teaching_methods_101':
 	end
 	act'Play with your phone':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 		'You take out your phone and begin to play a game, hoping the boring lesson will be over soon.'
 		playphone = rand(1,2)
 		if playphone = 1:
@@ -482,7 +482,7 @@ if $ARGS[0] = 'teaching_methods_101':
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 					'You ignore him and continue using your phone. Mr. Pasternak shakes his head disapprovingly and continues the lesson.'
 					act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'teaching_methods'
 				end
@@ -709,7 +709,7 @@ if $ARGS[0] = 'learning_theories_101':
 	end
 	act'Play with your phone':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 		'You take out your phone and begin to play a game, hoping the boring lesson will be over soon.'
 		playphone = rand(1,4)
 		if playphone = 1:
@@ -725,7 +725,7 @@ if $ARGS[0] = 'learning_theories_101':
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 					'You ignore her and continue using your phone, she just shakes her head and continues her lecture.'
 					act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'learning_theories'
 				end

locations/uni_lessons2.qsrc

@@ -212,7 +212,7 @@ if $ARGS[0] = 'general_education_102':
 	end
 	act'Play with your phone':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 		'You take out your phone and begin playing a game, hoping the this boring lesson will be over soon.'
 		playphone = rand(1,2)
 		if playphone = 1:
@@ -229,7 +229,7 @@ if $ARGS[0] = 'general_education_102':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 					'You ignore him and keep using your phone as he just shakes his head and goes back to his lecture.'
 					act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'general_education'
 				end
@@ -466,7 +466,7 @@ if $ARGS[0] = 'teaching_methods_102':
 	end
 	act'Play with your phone':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 		'You take out your phone and begin to play a game, hoping the boring lesson will be over soon.'
 		playphone = rand(1,2)
 		if playphone = 1:
@@ -482,7 +482,7 @@ if $ARGS[0] = 'teaching_methods_102':
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 					'You ignore him and continue using your phone. Mr. Pasternak shakes his head disapprovingly and continues the lesson.'
 					act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'teaching_methods'
 				end
@@ -709,7 +709,7 @@ if $ARGS[0] = 'psychology_of_a_student_101':
 	end
 	act'Play with your phone':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 		'You take out your phone and begin to play a game, hoping the boring lesson will be over soon.'
 		playphone = rand(1,4)
 		if playphone = 1:
@@ -725,7 +725,7 @@ if $ARGS[0] = 'psychology_of_a_student_101':
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone<<rand(1,3)>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
 					'You ignore her and continue using your phone, she just shakes her head and continues her lecture.'
 					act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'psychology_of_a_student_101'
 				end