[edit] changed some image locations

locations/gschool_lessons.qsrc

@@ -136,9 +136,7 @@ if $ARGS[0] = 'short_break':
 	killvar '$breaktype'
 	menu_off = 1
 	gs 'stat'
-	if Kuznetsov_punishment = 1:
-		gt 'gschool_lessonev2', 'shop_punishment'
-	elseif school_period = 1:
+	if school_period = 1:
 		if hour = 6:
 			minut += 165-minut
 		elseif hour = 7:
@@ -258,11 +256,10 @@ if $ARGS[0] = 'short_break':
 		act 'Move to next class': gt 'gschool_lessons', 'schedule'
 
 		act 'Skip next class': school_period += 1 & gt 'gschool_lessons', 'skip'
-	elseif Kuznecov_shop_punishment = 1:
-		Kuznecov_shop_punishment = 0
+	elseif Kuznetsov_punishment = 1:
 		'<center><b><font color="maroon">School Hallway</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
-		act 'Go to Kuznecov''s study': gt 'gschool_lessonsev2','shop punishment'
+		act 'Go to Kuznecov''s study': gt 'gschool_lessonsev2','shop_punishment'
 		act 'Leave the school': gt 'gschool_lessons', 'schedule'
 	else
 		gt 'gschool_lessons', 'schedule'

locations/gschool_lessons1.qsrc

@@ -136,8 +136,8 @@ if $ARGS[0] = 'russian':
 			act 'Regular selfie':
 				*clr & cla
 				i = rand(1,classroom_clotot)
-				dynamic 'classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/clothed/<<i>>.jpg"></center>'
+				dynamic 'school_classroom_closelfie[<<i>>] = 1'
+				'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie of your face during class, nothing to daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Mr. Yenotin even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 			end
@@ -151,8 +151,8 @@ if $ARGS[0] = 'russian':
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
 					i = rand(1,classroom_titflash)
-					dynamic 'classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/titflash/<<i>>.jpg"></center>'
+					dynamic 'school_classroom_titflash[<<i>>] = 1'
+					'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash you decide a selfie of your bare breasts in the middle of class will be a great idea. Maybe you will share it and maybe not. But either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 				end
@@ -170,8 +170,8 @@ if $ARGS[0] = 'russian':
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_pussyflash)
-						dynamic 'classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/pussyflash/<<i>>.jpg"></center>'
+						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
+						'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. A selfie of your bare pussy in the middle of class would be stimulating memory, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end
@@ -625,8 +625,8 @@ if $ARGS[0] = 'geography':
 			act 'Regular selfie':
 				*clr & cla
 				i = rand(1,classroom_clotot)
-				dynamic 'classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/clothed/<<i>>.jpg"></center>'
+				dynamic 'school_classroom_closelfie[<<i>>] = 1'
+				'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie of your face during class, nothing to daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Mr. Yenotin even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 			end
@@ -640,8 +640,8 @@ if $ARGS[0] = 'geography':
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
 					i = rand(1,classroom_titflash)
-					dynamic 'classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/titflash/<<i>>.jpg"></center>'
+					dynamic 'school_classroom_titflash[<<i>>] = 1'
+					'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash you decide a selfie of your bare breasts in the middle of class will be a great idea. Maybe you will share it and maybe not. But either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 				end
@@ -659,8 +659,8 @@ if $ARGS[0] = 'geography':
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_pussyflash)
-						dynamic 'classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/pussyflash/<<i>>.jpg"></center>'
+						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
+						'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. A selfie of your bare pussy in the middle of class would be stimulating memory, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 					end
@@ -1116,8 +1116,8 @@ if $ARGS[0] = 'history':
 			act 'Regular selfie':
 				*clr & cla
 				i = rand(1,classroom_clotot)
-				dynamic 'classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/clothed/<<i>>.jpg"></center>'
+				dynamic 'school_classroom_closelfie[<<i>>] = 1'
+				'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie of your face during class, nothing to daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Mr. Yenotin even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 			end
@@ -1131,8 +1131,8 @@ if $ARGS[0] = 'history':
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
 					i = rand(1,classroom_titflash)
-					dynamic 'classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/titflash/<<i>>.jpg"></center>'
+					dynamic 'school_classroom_titflash[<<i>>] = 1'
+					'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash you decide a selfie of your bare breasts in the middle of class will be a great idea. Maybe you will share it and maybe not. But either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 				end
@@ -1150,8 +1150,8 @@ if $ARGS[0] = 'history':
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_pussyflash)
-						dynamic 'classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/pussyflash/<<i>>.jpg"></center>'
+						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
+						'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. A selfie of your bare pussy in the middle of class would be stimulating memory, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 					end

locations/gschool_lessons2.qsrc

@@ -139,8 +139,8 @@ if $ARGS[0] = 'computer':
 			act 'Regular selfie':
 				*clr & cla
 				i = rand(1,classroom_clotot)
-				dynamic 'classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/clothed/<<i>>.jpg"></center>'
+				dynamic 'school_classroom_closelfie[<<i>>] = 1'
+				'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie of your face during class, nothing to daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Mr. Yenotin even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 			end
@@ -154,8 +154,8 @@ if $ARGS[0] = 'computer':
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
 					i = rand(1,classroom_titflash)
-					dynamic 'classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/titflash/<<i>>.jpg"></center>'
+					dynamic 'school_classroom_titflash[<<i>>] = 1'
+					'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash you decide a selfie of your bare breasts in the middle of class will be a great idea. Maybe you will share it and maybe not. But either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 				end
@@ -173,8 +173,8 @@ if $ARGS[0] = 'computer':
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_pussyflash)
-						dynamic 'classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/pussyflash/<<i>>.jpg"></center>'
+						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
+						'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. A selfie of your bare pussy in the middle of class would be stimulating memory, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 					end
@@ -638,8 +638,8 @@ if $ARGS[0] = 'science':
 			act 'Regular selfie':
 				*clr & cla
 				i = rand(1,classroom_clotot)
-				dynamic 'classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/clothed/<<i>>.jpg"></center>'
+				dynamic 'school_classroom_closelfie[<<i>>] = 1'
+				'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie of your face during class, nothing to daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Miss Orlov even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 			end
@@ -653,8 +653,8 @@ if $ARGS[0] = 'science':
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
 					i = rand(1,classroom_titflash)
-					dynamic 'classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/titflash/<<i>>.jpg"></center>'
+					dynamic 'school_classroom_titflash[<<i>>] = 1'
+					'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash you decide a selfie of your bare breasts in the middle of class will be a great idea. Maybe you will share it and maybe not. But either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 				end
@@ -672,8 +672,8 @@ if $ARGS[0] = 'science':
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_pussyflash)
-						dynamic 'classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/pussyflash/<<i>>.jpg"></center>'
+						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
+						'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. A selfie of your bare pussy in the middle of class would be stimulating memory, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 					end
@@ -1012,8 +1012,8 @@ if $ARGS[0] = 'music':
 			act 'Regular selfie':
 				*clr & cla
 				i = rand(1,classroom_clotot)
-				dynamic 'classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/clothed/<<i>>.jpg"></center>'
+				dynamic 'school_classroom_closelfie[<<i>>] = 1'
+				'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie of your face during class, nothing to daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Mr. Vasilyev even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 			end
@@ -1027,8 +1027,8 @@ if $ARGS[0] = 'music':
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
 					i = rand(1,classroom_titflash)
-					dynamic 'classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/titflash/<<i>>.jpg"></center>'
+					dynamic 'school_classroom_titflash[<<i>>] = 1'
+					'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash you decide a selfie of your bare breasts in the middle of class will be a great idea. Maybe you will share it and maybe not. But either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 				end
@@ -1046,8 +1046,8 @@ if $ARGS[0] = 'music':
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_pussyflash)
-						dynamic 'classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/pussyflash/<<i>>.jpg"></center>'
+						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
+						'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. A selfie of your bare pussy in the middle of class would be stimulating memory, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 					end
@@ -1487,8 +1487,8 @@ if $ARGS[0] = 'biology':
 			act 'Regular selfie':
 				*clr & cla
 				i = rand(1,classroom_clotot)
-				dynamic 'classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/clothed/<<i>>.jpg"></center>'
+				dynamic 'school_classroom_closelfie[<<i>>] = 1'
+				'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie of your face during class, nothing to daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Miss Orlov even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 			end
@@ -1502,8 +1502,8 @@ if $ARGS[0] = 'biology':
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
 					i = rand(1,classroom_titflash)
-					dynamic 'classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/titflash/<<i>>.jpg"></center>'
+					dynamic 'school_classroom_titflash[<<i>>] = 1'
+					'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash you decide a selfie of your bare breasts in the middle of class will be a great idea. Maybe you will share it and maybe not. But either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 				end
@@ -1521,8 +1521,8 @@ if $ARGS[0] = 'biology':
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_pussyflash)
-						dynamic 'classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/pussyflash/<<i>>.jpg"></center>'
+						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
+						'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. A selfie of your bare pussy in the middle of class would be stimulating memory, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 					end

locations/gschool_lessons3.qsrc

@@ -630,8 +630,8 @@ if $ARGS[0] = 'art':
 				act 'Regular selfie':
 					*clr & cla
 					i = rand(1,classroom_clotot)
-					dynamic 'classroom_closelfie[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/clothed/<<i>>.jpg"></center>'
+					dynamic 'school_classroom_closelfie[<<i>>] = 1'
+					'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 					'Just a cute selfie of your face during class, nothing to daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Mr. Vasilyev even noticing.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 				end
@@ -645,8 +645,8 @@ if $ARGS[0] = 'art':
 						gs 'exhibitionism', 1
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_titflash)
-						dynamic 'classroom_titflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/titflash/<<i>>.jpg"></center>'
+						dynamic 'school_classroom_titflash[<<i>>] = 1'
+						'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 						'Your tits yeah that would be awesome, a selfie of your bare bare breasts in the middle of class, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone and tease them with it. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 					end
@@ -664,8 +664,8 @@ if $ARGS[0] = 'art':
 							gs 'exhibitionism', 3
 							gs 'fame', 'pav', 'sex', 3
 							i = rand(1,classroom_pussyflash)
-							dynamic 'classroom_pussyflash[<<i>>] = 1'
-							'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/pussyflash/<<i>>.jpg"></center>'
+							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
+							'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 							'Your pussy yeah that would be awesome, a selfie of your bare bare pussy in the middle of class, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone and tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 						end
@@ -1152,8 +1152,8 @@ if $ARGS[0] = 'shop':
 				act 'Regular selfie':
 					*clr & cla
 					i = rand(1,classroom_clotot)
-					dynamic 'classroom_closelfie[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/clothed/<<i>>.jpg"></center>'
+					dynamic 'school_classroom_closelfie[<<i>>] = 1'
+					'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 					'Just a cute selfie of your face during class, nothing to daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Mr. Kuznetsov even noticing.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 				end
@@ -1167,8 +1167,8 @@ if $ARGS[0] = 'shop':
 						gs 'exhibitionism', 1
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_titflash)
-						dynamic 'classroom_titflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/titflash/<<i>>.jpg"></center>'
+						dynamic 'school_classroom_titflash[<<i>>] = 1'
+						'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 						'Your tits yeah that would be awesome, a selfie of your bare bare breasts in the middle of class, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone and tease them with it. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 					end
@@ -1186,8 +1186,8 @@ if $ARGS[0] = 'shop':
 							gs 'exhibitionism', 3
 							gs 'fame', 'pav', 'sex', 3
 							i = rand(1,classroom_pussyflash)
-							dynamic 'classroom_pussyflash[<<i>>] = 1'
-							'<center><img <<$set_imgh>> src="images/pc/selfies/classroom/pussyflash/<<i>>.jpg"></center>'
+							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
+							'<center><img <<$set_imgh>> src="images/pc/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 							'Your pussy yeah that would be awesome, a selfie of your bare bare pussy in the middle of class, maybe you will share it and maybe not. But either way it should be fun and could be fun to send to someone and tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 						end

locations/phone_selfies.qsrc

@@ -1004,7 +1004,7 @@ end
 
 if $ARGS[0] = 'classroom':
 	'<center><h4><font color="maroon">Classroom selfies</font></h4></center>'
-	$phone_loc = 'classroom'
+	$phone_loc = 'school_classroom'
 	undvar = 0
 	nudvar = 0
 	*nl