Browse Source

[Changed][Fixed] Refactor selfie code to make it easier to maintain and add new locations. Added in restroom and school_bathroom, the code was half completed and we had the images.

philormand 4 years ago
parent
commit
15d44d55a7

+ 4 - 0
locations/FedorEv3.qsrc

@@ -376,6 +376,7 @@ if $ARGS[0] = 'Movies 2':
 	pcs_mood += 20
 	EndMovie = 1
 	minut += 5			
+	killvar '$locclass'
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:
@@ -431,6 +432,7 @@ if $ARGS[0] = 'Ladies Room':
 	$metkaM = 'Ladies Room'
 	$locM = 'FedorEv3'
 	$location_type = 'bathroom'	
+	$locclass = 'restroom'
 	$menu_loc = 'FedorEv3'
 	$menu_arg = 'Ladies Room'
 	menu_off = 0
@@ -462,6 +464,7 @@ if $ARGS[0] = 'Mens Room':
 	$metkaM = 'Mens Room'
 	$locM = 'FedorEv3'	
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	$menu_loc = 'FedorEv3'
 	$menu_arg = 'Mens Room'
 	menu_off = 0	
@@ -1330,6 +1333,7 @@ if $ARGS[0] = 'Movies 3':
 	WithFedor = 0
 	EndMovie = 0
 	FedorRestTimes = 0
+	killvar '$locclass'
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:

+ 1 - 0
locations/FedorMisc.qsrc

@@ -470,6 +470,7 @@ if $ARGS[0] = 'Restroom':
 	$metkaM = 'Restroom'
 	$locM = 'FedorMisc'
 	$location_type = 'bathroom'
+	$locclass = 'school_bathroom'
 	$menu_loc = 'FedorMisc'
 	$menu_arg = 'Restroom'
 	menu_off = 0

+ 18 - 0
locations/LOCA.qsrc

@@ -2,6 +2,24 @@
 
 if settingmode!0: killvar '$cheatmenu'
 
+!{
+msg "Changed Location 
+	$menu_loc		<<$menu_loc>> 
+	$menu_arg		<<$menu_arg>> 
+	$metka			<<$metka>> 
+	$loc			<<$loc>> 
+	$metkaStreet	<<$metkaStreet>> 
+	$locStreet		<<$locStreet>> 
+	$location_type	<<$location_type>> 
+	$locM			<<$locM>>
+	$locclass		<<$locclass>>"
+
+msg "Changed Location 
+	$loc			<<$loc>> 
+	$location_type	<<$location_type>> 
+	$locclass		<<$locclass>>"
+}
+
 if mod_list > 0:
 	mod_i=1
 	:mod_exec

+ 1 - 0
locations/NewCloShop.qsrc

@@ -6,6 +6,7 @@ if $ARGS[0] = 'start':
 	$loc = 'NewCloShop'
 	$menu_loc = 'NewCloShop'
 	$menu_arg = 'start'
+	killvar '$locclass'
 	menu_off = 0
 	!!Variable for buying underwear for Natasha so it only procs once per changingroom event
 	NatbelQW['underwearShop'] = 0

+ 1 - 0
locations/NikoEv2.qsrc

@@ -89,6 +89,7 @@ if $ARGS[0] = 'Home Date':
 end
 
 if $ARGS[0] = 'Reward':
+	killvar '$locclass'
 	*clr & cla
 	gs 'boyStat', 'A190'
 	if pav_sex < 230:pav_sex = 250 

+ 4 - 0
locations/NikoSlut.qsrc

@@ -3,6 +3,7 @@
 menu_off = 1
 
 if $ARGS[0] = 'Customers':
+	killvar '$locclass'
 	if NikoSlut = 2 and NikoDiner > 0:
 		NikoCust = rand(1,16)
 		if NikoDinerSlut >= 18 and VKBikerAttack = 0 and VKWip = 100:
@@ -1301,6 +1302,7 @@ if $ARGS[0] = 'Diner Exterior':
 end
 
 if $ARGS[0] = 'Diner Interior':
+	killvar '$locclass'
 	*clr & cla
 	if $YurikEv['Name'] = '':$YurikEv['Name'] = 'a burly bearded man'
 	gs'stat'
@@ -1409,6 +1411,7 @@ if $ARGS[0] = 'Mens Restroom':
 	$metkaM = 'Mens Restroom'
 	$locM = 'NikoSlut'
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/m_restroom.jpg"></center>'
@@ -1428,6 +1431,7 @@ if $ARGS[0] = 'Ladies Restroom':
 	$metkaM = 'Ladies Restroom'
 	$locM = 'NikoSlut'
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/l_restroom.jpg"></center>'

+ 2 - 0
locations/bordel.qsrc

@@ -28,6 +28,7 @@ if $ARGS[0] = 'brothel':
 	$menu_loc = 'bordel'
 	$menu_arg = 'brothel'
 	menu_off = 0
+	killvar '$locclass'
 	cla
 	*clr
 	gs 'stat'
@@ -73,6 +74,7 @@ if $ARGS[0] = 'dysh':
 	$metkaM = 'dysh'
 	$locM = 'bordel'
     $location_type = 'bathroom'
+	$locclass = 'restroom'
 	$menu_loc = 'bordel'
 	$menu_arg = 'dysh'
 	menu_off = 0

+ 1 - 0
locations/burger.qsrc

@@ -6,6 +6,7 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'burger'
 	$menu_arg = 'start'
 	menu_off = 0
+	killvar '$locclass'
 	*clr & cla
 	$location_type = 'public_indoors'
 	CLOSE ALL

+ 1 - 0
locations/butoilet.qsrc

@@ -6,6 +6,7 @@ $loc = $CURLOC
 $metkaM = $ARGS[0]
 $locM = $CURLOC
 $location_type = 'bathroom'
+$locclass = 'restroom'
 $menu_loc = 'butoilet'
 $menu_arg = ''
 menu_off = 0

+ 2 - 1
locations/city_industrial_train.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = 'inside':
 	$menu_arg = 'inside'
 	menu_off = 0
 	$location_type = 'public_indoors'
+	killvar '$locclass'
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/vokzal.mp3',30
 	*clr & cla
@@ -85,7 +86,7 @@ if $ARGS[0] = 'toilet':
 	$menu_arg = 'inside'
 	menu_off = 0
 	$location_type = 'bathroom'
-	
+	$locclass = 'restroom'	
 	*clr & cla
 	gs'stat'
 

+ 1 - 0
locations/city_kafe.qsrc

@@ -238,6 +238,7 @@ if $ARGS[0] = 'workPred':
 	$metka = 'workPred'
 	$loc = 'city_kafe'
 	$location_type = 'event'
+	killvar '$locclass'
 	*clr & cla
 	gs 'kit_din'
 	gs 'stat'

+ 2 - 0
locations/city_kafe2.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'toilet':
 
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	$locM = 'city_kafe2'
 	$metkaM = 'toilet'
 	$menu_loc = 'city_kafe2'
@@ -181,6 +182,7 @@ end
 if $ARGS[0] = 'ashot':
 	$loc = 'city_kafe2'
 	$metka = 'ashot'
+	$locclass = 'kitr'
 	cls
 	gs 'stat'
 	'You go into the kitchen where trainee chef Ashot is cooking. Dishwasher <a href="exec:gt ''city_kafe2'', ''tamdin''">Tamara</a> as always stands near the sink and washes the dishes.'

+ 2 - 0
locations/club.qsrc

@@ -83,6 +83,7 @@ if $ARGS[0] = 'inside':
 	$menu_arg = 'inside'
 	menu_off = 0
 	$location_type = 'public_indoors'
+	killvar '$locclass'
 	*clr & cla
 	minut += 5
 	frost = 0
@@ -223,6 +224,7 @@ if $ARGS[0] = 'tou':
 	$locM = 'club'
 	$metkaM = 'tou'
     $location_type = 'bathroom'
+	$locclass = 'restroom'
 	$menu_loc = 'club'
 	$menu_arg = 'tou'
 	menu_off = 0

+ 1 - 0
locations/gdktoilet.qsrc

@@ -8,6 +8,7 @@ gs 'themes', 'indoors'
 if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	$metka = 'start'
+	killvar '$locclass'
 	menu_off = 0
 	gs 'stat'
 	*clr & cla

+ 1 - 0
locations/gdktoilet_womens.qsrc

@@ -9,6 +9,7 @@ if $ARGS[0] = 'womens':
 	$menu_arg = 'womens'
 	menu_off = 0
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Women''s Room</font></b></center>'

+ 1 - 0
locations/gschool_break.qsrc

@@ -90,6 +90,7 @@ end
 
 if $ARGS[0] = 'restroom_actions':
 	$location_type = 'bathroom'
+	$locclass = 'school_bathroom'
 	act 'Leave the restroom': 
 		minut += 5
 		if $breaktype = 'long':

+ 1 - 0
locations/gschool_girls_bathroom.qsrc

@@ -4,6 +4,7 @@
 !!This bathroom file is for the bathroom scenes when Sveta is skiping class
 if $ARGS[0] = 'start':
 	$location_type = 'bathroom'
+	$locclass = 'school_bathroom'
 	*clr & cla
 	$menu_loc = 'gschool_girls_bathroom'
 	$menu_arg = 'start'

+ 3 - 0
locations/gschool_grounds.qsrc

@@ -9,6 +9,7 @@ if $ARGS[0] = 'main':
 	$menu_loc = 'gschool_grounds'
 	$menu_arg = 'main'
 	menu_off = 0
+	killvar '$locclass'
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Outside School</font></b></center>'
@@ -331,6 +332,7 @@ if $ARGS[0] = 'sports':
 	$menu_loc = 'gschool_grounds'
 	$menu_arg = 'sports'
 	menu_off = 0
+	killvar '$locclass'
 	*clr & cla
 	gs 'stat'
 	if month > 3 and month < 11:
@@ -694,6 +696,7 @@ if $ARGS[0] = 'change_room':
 	$metka = 'change_room'
 	$loc = 'gschool_grounds'
 	$location_type = 'bathroom'
+	$locclass = 'lockeroom'
 	$locM = 'gschool_grounds'
 	$metkaM = 'change_room'
 	$menu_loc = 'gschool_grounds'

+ 2 - 0
locations/gschool_lessons.qsrc

@@ -5,6 +5,7 @@ if $ARGS[0] = 'morning':
 	$menu_loc = 'gschool_lessons'
 	$menu_arg = 'morning'
 	$location_type = 'public_indoors'
+	killvar '$locclass'
 	menu_off = 0
 	
 	if school_check_day ! daystart:
@@ -104,6 +105,7 @@ end
 
 if $ARGS[0] = 'short_break':
 	killvar '$breaktype'
+	killvar '$locclass'
 	menu_off = 1
 	gs 'stat'
 	if school_period = 1:

+ 21 - 12
locations/gschool_lessons1.qsrc

@@ -142,13 +142,14 @@ if $ARGS[0] = 'russian':
 		end
 
 		act 'Take selfie':
-			gs 'telefon', 'Phone_selfie_totals'
+			gs 'phone_selfies', 'Phone_selfie_totals'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/takeselfie.jpg"></center>'
 			'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				i = rand(1,classroom_clotot)
+				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				i = rand(1,temp_selfietot)
 				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.'
@@ -163,7 +164,8 @@ if $ARGS[0] = 'russian':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					i = rand(1,classroom_titflash)
+					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					i = rand(1,temp_selfietot)
 					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.'
@@ -182,7 +184,8 @@ if $ARGS[0] = 'russian':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						i = rand(1,classroom_pussyflash)
+						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						i = rand(1,temp_selfietot)
 						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.'
@@ -644,13 +647,14 @@ if $ARGS[0] = 'geography':
 		end
 	
 		act 'Take selfie':
-			gs 'telefon', 'Phone_selfie_totals'
+			gs 'phone_selfies', 'Phone_selfie_totals'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/takeselfie.jpg"></center>'
 			'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				i = rand(1,classroom_clotot)
+				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				i = rand(1,temp_selfietot)
 				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.'
@@ -665,7 +669,8 @@ if $ARGS[0] = 'geography':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					i = rand(1,classroom_titflash)
+					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					i = rand(1,temp_selfietot)
 					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.'
@@ -684,7 +689,8 @@ if $ARGS[0] = 'geography':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						i = rand(1,classroom_pussyflash)
+						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						i = rand(1,temp_selfietot)
 						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.'
@@ -1148,13 +1154,14 @@ if $ARGS[0] = 'history':
 		end
 			
 		act 'Take selfie':
-			gs 'telefon', 'Phone_selfie_totals'
+			gs 'phone_selfies', 'Phone_selfie_totals'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/takeselfie.jpg"></center>'
 			'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				i = rand(1,classroom_clotot)
+				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				i = rand(1,temp_selfietot)
 				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.'
@@ -1169,7 +1176,8 @@ if $ARGS[0] = 'history':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					i = rand(1,classroom_titflash)
+					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					i = rand(1,temp_selfietot)
 					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.'
@@ -1188,7 +1196,8 @@ if $ARGS[0] = 'history':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						i = rand(1,classroom_pussyflash)
+						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						i = rand(1,temp_selfietot)
 						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.'

+ 21 - 12
locations/gschool_lessons2.qsrc

@@ -146,13 +146,14 @@ if $ARGS[0] = 'computer':
 		end
 		
 		act 'Take selfie':
-			gs 'telefon', 'Phone_selfie_totals'
+			gs 'phone_selfies', 'Phone_selfie_totals'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/takeselfie.jpg"></center>'
 			'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				i = rand(1,classroom_clotot)
+				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				i = rand(1,temp_selfietot)
 				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.'
@@ -167,7 +168,8 @@ if $ARGS[0] = 'computer':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					i = rand(1,classroom_titflash)
+					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					i = rand(1,temp_selfietot)
 					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.'
@@ -186,7 +188,8 @@ if $ARGS[0] = 'computer':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						i = rand(1,classroom_pussyflash)
+						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						i = rand(1,temp_selfietot)
 						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.'
@@ -657,13 +660,14 @@ if $ARGS[0] = 'science':
 		end
 
 		act 'Take selfie':
-			gs 'telefon', 'Phone_selfie_totals'
+			gs 'phone_selfies', 'Phone_selfie_totals'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/takeselfie.jpg"></center>'
 			'While looking at your phone you  decided now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				i = rand(1,classroom_clotot)
+				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				i = rand(1,temp_selfietot)
 				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.'
@@ -678,7 +682,8 @@ if $ARGS[0] = 'science':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					i = rand(1,classroom_titflash)
+					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					i = rand(1,temp_selfietot)
 					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.'
@@ -697,7 +702,8 @@ if $ARGS[0] = 'science':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						i = rand(1,classroom_pussyflash)
+						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						i = rand(1,temp_selfietot)
 						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.'
@@ -1053,13 +1059,14 @@ if $ARGS[0] = 'music':
 		end
 		
 		act 'Take selfie':
-			gs 'telefon', 'Phone_selfie_totals'
+			gs 'phone_selfies', 'Phone_selfie_totals'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/takeselfie.jpg"></center>'
 			'While looking at your phone you  decided now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				i = rand(1,classroom_clotot)
+				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				i = rand(1,temp_selfietot)
 				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.'
@@ -1074,7 +1081,8 @@ if $ARGS[0] = 'music':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					i = rand(1,classroom_titflash)
+					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					i = rand(1,temp_selfietot)
 					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.'
@@ -1093,7 +1101,8 @@ if $ARGS[0] = 'music':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						i = rand(1,classroom_pussyflash)
+						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						i = rand(1,temp_selfietot)
 						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.'

+ 14 - 8
locations/gschool_lessons3.qsrc

@@ -648,13 +648,14 @@ if $ARGS[0] = 'art':
 			end
 			
 			act 'Take selfie':
-				gs 'telefon', 'Phone_selfie_totals'
+				gs 'phone_selfies', 'Phone_selfie_totals'
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/takeselfie.jpg"></center>'
 				'While looking at your phone you  decided now would be a good time to take a selfie, but what kind of selfie should you take?'
 				act 'Regular selfie':
 					*clr & cla
-					i = rand(1,classroom_clotot)
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					i = rand(1,temp_selfietot)
 					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.'
@@ -669,7 +670,8 @@ if $ARGS[0] = 'art':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 1
 						gs 'fame', 'pav', 'sex', 3
-						i = rand(1,classroom_titflash)
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						i = rand(1,temp_selfietot)
 						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.'
@@ -688,7 +690,8 @@ if $ARGS[0] = 'art':
 							gs 'willpower', 'pay', 'self'
 							gs 'exhibitionism', 3
 							gs 'fame', 'pav', 'sex', 3
-							i = rand(1,classroom_pussyflash)
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							i = rand(1,temp_selfietot)
 							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.'
@@ -1181,13 +1184,14 @@ if $ARGS[0] = 'shop':
 			end
 			
 			act 'Take selfie':
-				gs 'telefon', 'Phone_selfie_totals'
+				gs 'phone_selfies', 'Phone_selfie_totals'
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/takeselfie.jpg"></center>'
 				'While looking at your phone you  decided now would be a good time to take a selfie, but what kind of selfie should you take?'
 				act 'Regular selfie':
 					*clr & cla
-					i = rand(1,classroom_clotot)
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					i = rand(1,temp_selfietot)
 					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.'
@@ -1202,7 +1206,8 @@ if $ARGS[0] = 'shop':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 1
 						gs 'fame', 'pav', 'sex', 3
-						i = rand(1,classroom_titflash)
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						i = rand(1,temp_selfietot)
 						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.'
@@ -1221,7 +1226,8 @@ if $ARGS[0] = 'shop':
 							gs 'willpower', 'pay', 'self'
 							gs 'exhibitionism', 3
 							gs 'fame', 'pav', 'sex', 3
-							i = rand(1,classroom_pussyflash)
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							i = rand(1,temp_selfietot)
 							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.'

+ 1 - 0
locations/gschool_lessons4.qsrc

@@ -1859,6 +1859,7 @@ if $ARGS[0] = 'post_dress':
 	$menu_loc = 'gschool_lessons4'
 	$menu_arg = 'post_dress'
 	$location_type = 'bathroom'
+	$locclass = 'lockeroom'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'

+ 1 - 0
locations/gschool_lunch.qsrc

@@ -118,6 +118,7 @@ if $ARGS[0] = 'break':
 	$menu_loc = 'gschool_lunch'
 	$menu_arg = 'break'
 	$location_type = 'public_indoors'
+	killvar '$locclass'
 	menu_off = 0
 	gs 'stat'
 	urand = rand(0,8)

+ 3 - 0
locations/pav_train_hall.qsrc

@@ -360,6 +360,7 @@ end
 if $ARGS[0] = 'toilet':
 	$menu_loc = 'pav_train_hall'
 	$menu_arg = 'toilet'
+	killvar '$locclass'
 	menu_off = 0
 	*clr & cla
 	vokzalToilet = 0
@@ -382,6 +383,7 @@ if $ARGS[0] = 'female':
 	$menu_arg = 'female'
 	menu_off = 0
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	*clr & cla
 	vokzalToilet = 1
 	gs 'stat'
@@ -408,6 +410,7 @@ if $ARGS[0] = 'male':
 	$menu_arg = 'male'
 	menu_off = 0
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	*clr & cla
 	vokzalToilet = 2
 	gs 'stat'

+ 223 - 223
locations/phone_selfies.qsrc

@@ -27,41 +27,188 @@
 		- loopmaxev:
 			For pictures Sveta takes of an npc
 	SVETA SELFIES:
-		The total amounts are kept in 'telefon', 'Phone_selfie_totals'.
+		The total amounts are kept in 'phone_selfies', 'Phone_selfie_totals'.
 		Increase the correct variable in there to have it added to the phone.
 }
 
+
+!!For setting the selfies
+if $ARGS[0] = 'Phone_selfie_totals':
+
+	$selfieLoc[0] = 'misc'
+	$selfieLocDesc[0] = 'Me'
+	$selfieFilePrefix[0] = 'phone_selfie'
+	selfieClotot[0] = 2
+	selfieUndtot[0] = 0
+	selfieNudtot[0] = 0
+	selfieTitflash[0] = 0
+	selfieAssflash[0] = 0
+	selfiePussyflash[0] = 0
+	selfieBathtot[0] = 0
+	selfieShowertot[0] = 0
+	selfieSwimtot[0] = 0
+
+	$selfieLoc[1] = 'bathroom'
+	$selfieLocDesc[1] = 'Bathroom'
+	$selfieFilePrefix[1] = ''
+	selfieClotot[1] = 30
+	selfieUndtot[1] = 23
+	selfieNudtot[1] = 30
+	selfieTitflash[1] = 30
+	selfieAssflash[1] = 5
+	selfiePussyflash[1] = 22
+	selfieBathtot[1] = 30
+	selfieShowertot[1] = 27
+	selfieSwimtot[1] = 0
+
+	$selfieLoc[2] = 'bedroom'
+	$selfieLocDesc[2] = 'Bedroom'
+	$selfieFilePrefix[2] = ''
+	selfieClotot[2] = 30
+	selfieUndtot[2] = 22
+	selfieNudtot[2] = 30
+	selfieTitflash[2] = 30
+	selfieAssflash[2] = 26
+	selfiePussyflash[2] = 25
+	selfieBathtot[2] = 0
+	selfieShowertot[2] = 0
+	selfieSwimtot[2] = 0
+	
+	$selfieLoc[3] = 'kitchen'
+	$selfieLocDesc[3] = 'Kitchen'
+	$selfieFilePrefix[3] = ''
+	selfieClotot[3] = 27
+	selfieUndtot[3] = 23
+	selfieNudtot[3] = 23
+	selfieTitflash[3] = 21
+	selfieAssflash[3] = 1
+	selfiePussyflash[3] = 10
+	selfieBathtot[3] = 0
+	selfieShowertot[3] = 0
+	selfieSwimtot[3] = 0
+	
+	$selfieLoc[4] = 'livingroom'
+	$selfieLocDesc[4] = 'Livingroom'
+	$selfieFilePrefix[4] = ''
+	selfieClotot[4] = 30
+	selfieUndtot[4] = 27
+	selfieNudtot[4] = 30
+	selfieTitflash[4] = 30
+	selfieAssflash[4] = 5
+	selfiePussyflash[4] = 20
+	selfieBathtot[4] = 0
+	selfieShowertot[4] = 0
+	selfieSwimtot[4] = 0
+	
+	$selfieLoc[5] = 'changingroom'
+	$selfieLocDesc[5] = 'Changingroom'
+	$selfieFilePrefix[5] = ''
+	selfieClotot[5] = 30
+	selfieUndtot[5] = 30
+	selfieNudtot[5] = 30
+	selfieTitflash[5] = 30
+	selfieAssflash[5] = 20
+	selfiePussyflash[5] = 28
+	selfieBathtot[5] = 0
+	selfieShowertot[5] = 0
+	selfieSwimtot[5] = 0
+	
+	$selfieLoc[6] = 'park'
+	$selfieLocDesc[6] = 'Park'
+	$selfieFilePrefix[6] = ''
+	selfieClotot[6] = 30
+	selfieUndtot[6] = 4
+	selfieNudtot[6] = 17
+	selfieTitflash[6] = 26
+	selfieAssflash[6] = 2
+	selfiePussyflash[6] = 8
+	selfieBathtot[6] = 0
+	selfieShowertot[6] = 0
+	selfieSwimtot[6] = 0
+	
+	$selfieLoc[7] = 'lockeroom'
+	$selfieLocDesc[7] = 'Lockeroom'
+	$selfieFilePrefix[7] = ''
+	selfieClotot[7] = 26
+	selfieUndtot[7] = 21
+	selfieNudtot[7] = 13
+	selfieTitflash[7] = 13
+	selfieAssflash[7] = 2
+	selfiePussyflash[7] = 3
+	selfieBathtot[7] = 0
+	selfieShowertot[7] = 0
+	selfieSwimtot[7] = 0
+	
+	$selfieLoc[8] = 'beach'
+	$selfieLocDesc[8] = 'Beach'
+	$selfieFilePrefix[8] = ''
+	selfieClotot[8] = 0
+	selfieUndtot[8] = 0
+	selfieNudtot[8] = 20
+	selfieTitflash[8] = 17
+	selfieAssflash[8] = 3
+	selfiePussyflash[8] = 4
+	selfieBathtot[8] = 0
+	selfieShowertot[8] = 0
+	selfieSwimtot[8] = 21
+	
+	$selfieLoc[9] = 'school_classroom'
+	$selfieLocDesc[9] = 'School Classroom'
+	$selfieFilePrefix[9] = ''
+	selfieClotot[9] = 11
+	selfieUndtot[9] = 2
+	selfieNudtot[9] = 0
+	selfieTitflash[9] = 3
+	selfieAssflash[9] = 0
+	selfiePussyflash[9] = 3
+	selfieBathtot[9] = 0
+	selfieShowertot[9] = 0
+	selfieSwimtot[9] = 0
+	
+	$selfieLoc[10] = 'school_bathroom'
+	$selfieLocDesc[10] = 'School Bathroom'
+	$selfieFilePrefix[10] = ''
+	selfieClotot[10] = 28
+	selfieUndtot[10] = 12
+	selfieNudtot[10] = 0
+	selfieTitflash[10] = 8
+	selfieAssflash[10] = 1
+	selfiePussyflash[10] = 7
+	selfieBathtot[10] = 0
+	selfieShowertot[10] = 0
+	selfieSwimtot[10] = 0
+	
+	$selfieLoc[11] = 'restroom'
+	$selfieLocDesc[11] = 'Restroom'
+	$selfieFilePrefix[11] = ''
+	selfieClotot[11] = 30
+	selfieUndtot[11] = 25
+	selfieNudtot[11] = 3
+	selfieTitflash[11] = 30
+	selfieAssflash[11] = 13
+	selfiePussyflash[11] = 21
+	selfieBathtot[11] = 0
+	selfieShowertot[11] = 0
+	selfieSwimtot[11] = 0
+	
+end
+
+
 if $ARGS[0] = 'selfies':
 	menu_off = 0
-	gs 'telefon', 'Phone_selfie_totals'
+	gs 'phone_selfies', 'Phone_selfie_totals'
 	*clr & cla
 	
-	!!These variables determine which selfietypes need to be checked
-	clovar = 1
-	undvar = 1
-	nudvar = 1
-	swimvar = 0
-	bathvar = 0
-	showervar = 0
-	titflashvar = 1
-	assflashvar = 1
-	pussyflashvar = 1
-	
 	'<center><h4><font color="maroon">Photo library</font></h4></center>'
 	*nl
 	'Selfies'
-	'<a href="exec:gt ''phone_selfies'', ''bathroom''">Bathroom selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''bedroom''">Bedroom selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''kitchen''">Kitchen selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''livingroom''">Livingroom selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''changingroom''">Changingroom selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''city_park''">Park selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''lockerroom''">Lockerroom selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''beach''">Beach selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''gym''">Gym selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''dance''">Dance selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''classroom''">Classroom selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''misc''">Misc selfies</a>'
+
+	temp_locationCnt = 0
+	:LocationLoop
+		'<a href="exec:gt ''phone_selfies'', ''showlocation'', <<temp_locationCnt>>"><<$selfieLocDesc[temp_locationCnt]>> selfies</a>'
+		temp_locationCnt += 1
+	if temp_locationCnt < arrsize('$selfieLoc'): jump'LocationLoop'
+
 	*nl
 	'Family and friends'
 	'<a href="exec:gt ''phone_selfies'', ''family''">Family</a>'
@@ -73,133 +220,130 @@ if $ARGS[0] = 'selfies':
 	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
 end
 
+!! ARGS[1] is the index of the location in $selfieLoc[]
+if $ARGS[0] = 'showlocation':
+
+	'<center><h4><font color="maroon"><<$selfieLocDesc[ARGS[1]]>> selfies</font></h4></center>'
+	*nl
+	gs 'phone_selfies', 'listretrieve', ARGS[1]
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+
+!! ARGS[1] is the index of the location in $selfieLoc[]
 if $ARGS[0] = 'listretrieve':
+
 	!!Loop for clothed selfies, dynamics set variables as mixing them in loop instructions is bad
-	if clovar = 1:
+	if selfieClotot[ARGS[1]] > 0:
 		'<center><b>Clothed selfies</b></center>'
 		*nl
 		temp_clocnt = 1
-		dynamic 'temp_loop = <<$phone_loc>>_cloloop'
-		dynamic 'temp_total = <<$phone_loc>>_clotot'
 		:temp_loop
 			!!setting value to unmixed variable so it can be checked in the if below
-			dynamic '$phone_locval = <<$phone_loc>>_closelfie[<<temp_clocnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''clothed'', ''<<temp_clocnt>>''"><img src="images/pc/selfies/<<$phone_loc>>/clothed/<<temp_clocnt>>.jpg"     height="150" /></a>  '
+			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_closelfie[<<temp_clocnt>>]'
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''clothed'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>''"><img src="images/pc/selfies/<<$selfieLoc[ARGS[1]]>>/clothed/<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>.jpg"     height="150" /></a>  '
 			temp_clocnt += 1
-		if temp_clocnt <= temp_total: jump'temp_loop'
+		if temp_clocnt <= selfieClotot[ARGS[1]]: jump'temp_loop'
 	end
 	
 	!!Loop for swimwear selfies, dynamics set variables as mixing them in loop instructions is bad
-	if swimvar = 1:
+	if selfieSwimtot[ARGS[1]] > 0:
 		'<center><b>Swimwear selfies</b></center>'
 		*nl
 		temp_clocnt = 1
-		dynamic 'temp_loop1 = <<$phone_loc>>_swimloop'
-		dynamic 'temp_total = <<$phone_loc>>_swim'
 		:temp_loop1
 			!!setting value to unmixed variable so it can be checked in the if below
-			dynamic '$phone_locval = <<$phone_loc>>_swim[<<temp_clocnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''bikini'', ''<<temp_clocnt>>''"><img src="images/pc/selfies/<<$phone_loc>>/bikini/<<temp_clocnt>>.jpg"     height="150" /></a>  '
+			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_swim[<<temp_clocnt>>]'
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''bikini'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>''"><img src="images/pc/selfies/<<$selfieLoc[ARGS[1]]>>/bikini/<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>.jpg"     height="150" /></a>  '
 			temp_clocnt += 1
-		if temp_clocnt <= temp_total: jump'temp_loop1'
+		if temp_clocnt <= selfieSwimtot[ARGS[1]]: jump'temp_loop1'
 	end
 		
 	!!loop for underwear selfies
-	if undvar = 1:
+	if selfieUndtot[ARGS[1]] > 0:
 		'<center><b>Underwear selfies</b></center>'
 		*nl
 		temp_undcnt = 1
-		dynamic 'temp_loop2 = <<$phone_loc>>_undloop'
-		dynamic 'temp_total = <<$phone_loc>>_undtot'
 		:temp_loop2
-			dynamic '$phone_locval = <<$phone_loc>>_undselfie[<<temp_undcnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''underwear'', ''<<temp_undcnt>>''"><img src="images/pc/selfies/<<$phone_loc>>/underwear/<<temp_undcnt>>.jpg"     height="150" /></a>  '
+			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_undselfie[<<temp_undcnt>>]'
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''underwear'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_undcnt>>''"><img src="images/pc/selfies/<<$selfieLoc[ARGS[1]]>>/underwear/<<$selfieFilePrefix[ARGS[1]]>><<temp_undcnt>>.jpg"     height="150" /></a>  '
 			temp_undcnt += 1
-		if temp_undcnt <= temp_total: jump'temp_loop2'
+		if temp_undcnt <= selfieUndtot[ARGS[1]]: jump'temp_loop2'
 	end
 
 	!!loop for nude selfies
-	if nudvar = 1:
+	if selfieNudtot[ARGS[1]] > 0:
 		'<center><b>Nude selfies</b></center>'
 		*nl
 		temp_nudcnt = 1
-		dynamic 'temp_loop3 = <<$phone_loc>>_nudloop'
-		dynamic 'temp_total = <<$phone_loc>>_nudtot'
 		:temp_loop3
-			dynamic '$phone_locval = <<$phone_loc>>_nudselfie[<<temp_nudcnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''nude'', ''<<temp_nudcnt>>''"><img src="images/pc/selfies/<<$phone_loc>>/nude/<<temp_nudcnt>>.jpg"     height="150" /></a>  '
+			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_nudselfie[<<temp_nudcnt>>]'
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''nude'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_nudcnt>>''"><img src="images/pc/selfies/<<$selfieLoc[ARGS[1]]>>/nude/<<$selfieFilePrefix[ARGS[1]]>><<temp_nudcnt>>.jpg"     height="150" /></a>  '
 			temp_nudcnt += 1
-		if temp_nudcnt <= temp_total: jump'temp_loop3'
+		if temp_nudcnt <= selfieNudtot[ARGS[1]]: jump'temp_loop3'
 	end
 	
 	!!loop for bath selfies
-	if bathvar = 1:
+	if selfieBathtot[ARGS[1]] > 0:
 		'<center><b>Bath selfies</b></center>'
 		*nl
 		temp_bathcnt = 1
-		dynamic 'temp_loop4 = <<$phone_loc>>_bathloop'
-		dynamic 'temp_total = <<$phone_loc>>_bathtot'
 		:temp_loop4
-			dynamic '$phone_locval = <<$phone_loc>>_bathselfie[<<temp_bathcnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''bath'', ''<<temp_bathcnt>>''"><img src="images/pc/selfies/<<$phone_loc>>/bath/<<temp_bathcnt>>.jpg"     height="150" /></a>  '
+			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_bathselfie[<<temp_bathcnt>>]'
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''bath'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_bathcnt>>''"><img src="images/pc/selfies/<<$selfieLoc[ARGS[1]]>>/bath/<<$selfieFilePrefix[ARGS[1]]>><<temp_bathcnt>>.jpg"     height="150" /></a>  '
 			temp_bathcnt += 1
-		if temp_bathcnt <= temp_total: jump'temp_loop4'
+		if temp_bathcnt <= selfieBathtot[ARGS[1]]: jump'temp_loop4'
 	end
 	
 	!!loop for shower selfies
-	if showervar = 1:
+	if selfieShowertot[ARGS[1]] > 0:
 		'<center><b>Shower selfies</b></center>'
 		*nl
 		temp_showercnt = 1
-		dynamic 'temp_loop5 = <<$phone_loc>>_showerloop'
-		dynamic 'temp_total = <<$phone_loc>>_showertot'
 		:temp_loop5
-			dynamic '$phone_locval = <<$phone_loc>>_showerselfie[<<temp_showercnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''shower'', ''<<temp_showercnt>>''"><img src="images/pc/selfies/<<$phone_loc>>/shower/<<temp_showercnt>>.jpg"     height="150" /></a>  '
+			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_showerselfie[<<temp_showercnt>>]'
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''shower'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_showercnt>>''"><img src="images/pc/selfies/<<$selfieLoc[ARGS[1]]>>/shower/<<$selfieFilePrefix[ARGS[1]]>><<temp_showercnt>>.jpg"     height="150" /></a>  '
 			temp_showercnt += 1
-		if temp_showercnt <= temp_total: jump'temp_loop5'
+		if temp_showercnt <= selfieShowertot[ARGS[1]]: jump'temp_loop5'
 	end
 	
 	!!loop for flashing tits selfies
-	if titflashvar = 1:
+	if selfieTitflash[ARGS[1]] > 0:
 		'<center><b>Flashing tits selfies</b></center>'
 		*nl
 		temp_flashtitscnt = 1
-		dynamic 'temp_loop6 = <<$phone_loc>>_titflashloop'
-		dynamic 'temp_total = <<$phone_loc>>_titflash'
 		:temp_loop6
-			dynamic '$phone_locval = <<$phone_loc>>_titflash[<<temp_flashtitscnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''titflash'', ''<<temp_flashtitscnt>>''"><img src="images/pc/selfies/<<$phone_loc>>/titflash/<<temp_flashtitscnt>>.jpg"     height="150" /></a>  '
+			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_titflash[<<temp_flashtitscnt>>]'
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''titflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashtitscnt>>''"><img src="images/pc/selfies/<<$selfieLoc[ARGS[1]]>>/titflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashtitscnt>>.jpg"     height="150" /></a>  '
 			temp_flashtitscnt += 1
-		if temp_flashtitscnt <= temp_total: jump'temp_loop6'
+		if temp_flashtitscnt <= selfieTitflash[ARGS[1]]: jump'temp_loop6'
 	end
 	
 	!!loop for flashing ass selfies
-	if assflashvar = 1:
+	if selfieAssflash[ARGS[1]] > 0:
 		'<center><b>Flashing ass selfies</b></center>'
 		*nl
 		temp_flashasscnt = 1
-		dynamic 'temp_loop7 = <<$phone_loc>>_assflashloop'
-		dynamic 'temp_total = <<$phone_loc>>_assflash'
 		:temp_loop7
-			dynamic '$phone_locval = <<$phone_loc>>_assflash[<<temp_flashasscnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''assflash'', ''<<temp_flashasscnt>>''"><img src="images/pc/selfies/<<$phone_loc>>/assflash/<<temp_flashasscnt>>.jpg"     height="150" /></a>  '
+			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_assflash[<<temp_flashasscnt>>]'
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''assflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashasscnt>>''"><img src="images/pc/selfies/<<$selfieLoc[ARGS[1]]>>/assflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashasscnt>>.jpg"     height="150" /></a>  '
 			temp_flashasscnt += 1
-		if temp_flashasscnt <= temp_total: jump'temp_loop7'
+		if temp_flashasscnt <= selfieAssflash[ARGS[1]]: jump'temp_loop7'
 	end
 	
 	!!loop for flashing pussy selfies
-	if pussyflashvar = 1:
+	if selfiePussyflash[ARGS[1]] > 0:
 		'<center><b>Flashing pussy selfies</b></center>'
 		*nl
 		temp_flashpussycnt = 1
-		dynamic 'temp_loop8 = <<$phone_loc>>_pussyflashloop'
-		dynamic 'temp_total = <<$phone_loc>>_pussyflash'
 		:temp_loop8
-			dynamic '$phone_locval = <<$phone_loc>>_pussyflash[<<temp_flashpussycnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''pussyflash'', ''<<temp_flashpussycnt>>''"><img src="images/pc/selfies/<<$phone_loc>>/pussyflash/<<temp_flashpussycnt>>.jpg"     height="150" /></a>  '
+			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_pussyflash[<<temp_flashpussycnt>>]'
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''pussyflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashpussycnt>>''"><img src="images/pc/selfies/<<$selfieLoc[ARGS[1]]>>/pussyflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashpussycnt>>.jpg"     height="150" /></a>  '
 			temp_flashpussycnt += 1
-		if temp_flashpussycnt <= temp_total: jump'temp_loop8'
+		if temp_flashpussycnt <= selfiePussyflash[ARGS[1]]: jump'temp_loop8'
 	end
 end
 
@@ -896,150 +1040,6 @@ if $ARGS[0] = 'listretrieve2':
 	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
 end
 
-
-if $ARGS[0] = 'bathroom':
-	'<center><h4><font color="maroon">Bathroom selfies</font></h4></center>'
-	$phone_loc = 'bathroom'
-	gs 'telefon', 'Phone_selfie_totals'
-	bathvar = 1
-	showervar = 1
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'bedroom':
-	'<center><h4><font color="maroon">Bedroom selfies</font></h4></center>'
-	$phone_loc = 'bedroom'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'kitchen':
-	'<center><h4><font color="maroon">Kitchen selfies</font></h4></center>'
-	$phone_loc = 'kitchen'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'livingroom':
-	'<center><h4><font color="maroon">Livingroom selfies</font></h4></center>'
-	$phone_loc = 'livingroom'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'changingroom':
-	'<center><h4><font color="maroon">Changingroom selfies</font></h4></center>'
-	$phone_loc = 'changingroom'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'city_park':
-	'<center><h4><font color="maroon">Park selfies</font></h4></center>'
-	$phone_loc = 'park'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'lockerroom':
-	'<center><h4><font color="maroon">Lockerroom selfies</font></h4></center>'
-	$phone_loc = 'lockerroom'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-		
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'beach':
-	'<center><h4><font color="maroon">Beach selfies</font></h4></center>'
-	$phone_loc = 'beach'
-	clovar = 0
-	undvar = 0
-	swimvar = 1
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-		
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'gym':
-	'<center><h4><font color="maroon">Gym selfies</font></h4></center>'
-	$phone_loc = 'gym'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-		
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'classroom':
-	'<center><h4><font color="maroon">Classroom selfies</font></h4></center>'
-	$phone_loc = 'school_classroom'
-	nudvar = 0
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-		
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'dance':
-	'<center><h4><font color="maroon">Dance selfies</font></h4></center>'
-	$phone_loc = 'dance'
-	undvar = 0
-	nudvar = 0
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-		
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'misc':
-	'<center><h4><font color="maroon">Misc selfies</font></h4></center>'
-	$phone_loc = 'dance'
-	undvar = 0
-	nudvar = 0
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-		
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
 if $ARGS[0] = 'family':
 	'<center><h4><font color="maroon">Family members</font></h4></center>'
 	$textgrup = ''

+ 2 - 3
locations/phone_selfies_popup.qsrc

@@ -2,12 +2,11 @@
 
 !! This is used to create a popup that shows the enlarged selfie
 
-!! show uses $phone_loc to determine where the picture is located
 if $ARGS[0] = 'show':
 	if usePopUps = 1:
-		msg '<img src="images/pc/selfies/<<$phone_loc>>/<<$ARGS[1]>>/<<$ARGS[2]>>.jpg">'
+		msg '<img src="images/pc/selfies/<<ARGS[1]>>/<<$ARGS[2]>>/<<$ARGS[3]>>.jpg">'
 	else
-		view 'images/pc/selfies/<<$phone_loc>>/<<$ARGS[1]>>/<<$ARGS[2]>>.jpg'
+		view 'images/pc/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$ARGS[3]>>.jpg'
 	end
 end
 

+ 159 - 256
locations/telefon.qsrc

@@ -29,6 +29,7 @@
 !	gs 'telefon', 'DeleteContact', 'A29'
 !
 
+
 ! Header for Phone Screen.  Keeps consistent and in one place
 $telefon['header'] = {
 	if telefon['UnreadSMS'] > 0:
@@ -1290,130 +1291,28 @@ end &! --- Phone_notebook ---
 
 !!----------------------------------------Camera-------------------------------------------------
 
-!!For setting the total numbers of selfies
-if $ARGS[0] = 'Phone_selfie_totals':
-	bathroom_clotot = 24
-	bathroom_undtot = 21
-	bathroom_nudtot = 27
-	bathroom_titflash = 20
-	bathroom_assflash = 5
-	bathroom_pussyflash = 22
-	bathroom_bathtot = 24
-	bathroom_showertot = 25
-	bedroom_clotot = 27
-	bedroom_undtot = 20
-	bedroom_nudtot = 25
-	bedroom_titflash = 30
-	bedroom_assflash = 21
-	bedroom_pussyflash = 23
-	kitchen_clotot = 27
-	kitchen_undtot = 23
-	kitchen_nudtot = 23
-	kitchen_titflash = 21
-	kitchen_assflash = 1
-	kitchen_pussyflash = 10
-	livingroom_clotot = 27
-	livingroom_undtot = 23
-	livingroom_nudtot = 20
-	livingroom_titflash = 20
-	livingroom_assflash = 5
-	livingroom_pussyflash = 20
-	changingroom_clotot = 22
-	changingroom_undtot = 25
-	changingroom_nudtot = 25
-	changingroom_titflash = 28
-	changingroom_assflash = 19
-	changingroom_pussyflash = 27
-	park_clotot = 28
-	park_undtot = 2
-	park_nudtot = 12
-	park_titflash = 21
-	park_assflash = 2
-	park_pussyflash = 8
-	lockeroom_clotot = 26
-	lockeroom_undtot = 21
-	lockeroom_nudtot = 13
-	lockeroom_titflash = 13
-	lockeroom_assflash = 2
-	lockeroom_pussyflash = 3
-	beach_swim = 21
-	beach_nudtot = 20
-	beach_titflash = 17
-	beach_assflash = 1
-	beach_pussyflash = 4
-	classroom_clotot = 11
-	classroom_titflash = 3
-	classroom_pussyflash = 3
-!!added underwear as I finally found some images
-	classroom_undtot = 2
-	!!classroom_assflash = 0
-!!I am adding a few more lines for selfies that I have, I am commenting them out for now until we add in the option to take the image. I named the first folder school_bathroom and the second folder restroom
-	!!school_bathroom_clotot = 24
-	!!school_bathroom_undtot = 9
-	!!school_bathroom_nudtot = 0
-	!!school_bathroom_assflash = 1
-	!!school_bathroom_titflash = 4
-	!!school_bathroom_pussyflash = 6
-	!!restroom_clotot = 34
-	!!restroom_undtot = 25
-	!!restroom_nudtot = 3
-	!!restroom_assflash = 10
-	!!restroom_titflash = 34
-	!!restroom_pussyflash = 21
-end
-
-
 !!for viewing photos on your phone
 if $ARGS[0] = 'Phone_pictures':
 	gt 'phone_selfies', 'selfies'
 end
 
 !!picking the selfie image when taking photos, this sets the location variable
+!{
+	$ARGS[1] is phone location if left blank it is a generic selfie	(one of the locations in $selfieLoc[])
+	$ARGS[2] is for flashing when clothed if left blank then it is not flashing
+}
 if $ARGS[0] = 'Phone_camera_selfie':
-	gs 'telefon', 'Phone_selfie_totals'
 	minut += rand(5,7)
-	if $location_type = 'bathroom':
-		$phone_loc = 'bathroom'
-		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'bedr':
-		$phone_loc = 'bedroom'
-		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'kitr':
-		$phone_loc = 'kitchen'
-		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'livingr':
-		$phone_loc = 'livingroom'
-		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'changingroom':
-		$phone_loc = 'changingroom'
-		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'city_park':
-		$phone_loc = 'park'
-		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'lockeroom':
-		$phone_loc = 'lockeroom'
-		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'beach':
-		$phone_loc = 'beach'
-		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'school_classroom':
-		$phone_loc = 'school_classroom'
-		gs 'telefon', 'Phone_selfie_image'
-!{for the above image sets school bathroom and restroom aka public bathrooms, not sure what all should be added below so leaving it for you crowke
-	elseif $locclass = 'school_bathroom':
-		$phone_loc = 'school_bathroom'
-		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'restroom':
-		$phone_loc = 'restroom'
-		gs 'telefon', 'Phone_selfie_image'}
+	if $ARGS[1] <> '':
+		gs 'telefon', 'Phone_selfie_image', $ARGS[1], $ARGS[2]
 	else
-		phone_rand = RAND(1,2)
-		phone_selfie[phone_rand] = 1
+		phone_rand = RAND(1,selfieClotot[0])
+		dynamic '<<$selfieLoc[0]>>_closelfie[<<phone_rand>>] = 1'
 		gs 'stat'
 		if usePopUps = 1:
-			msg '<img src="images/system/phone/selfie/phone_selfie<<phone_rand>>.jpg">'
+			msg '<img src="images/pc/selfies/<<$selfieLoc[0]>>/clothed/<<$selfieFilePrefix[0]>><<phone_rand>>.jpg">'
 		else
-			view 'images/system/phone/selfie/phone_selfie<<phone_rand>>.jpg'
+			view 'images/pc/selfies/<<$selfieLoc[0]>>/clothed/<<$selfieFilePrefix[0]>><<phone_rand>>.jpg'
 		end
 	end
 	!if spdirtyf > 0: phone_rand = RAND (m,n) - for SELF in the semen
@@ -1422,124 +1321,138 @@ if $ARGS[0] = 'Phone_camera_selfie':
 end
 
 !!taking selfies, this chooses a random image for the location for clothed, underwear and nude
+!{
+	$ARGS[1] is phone location (one of the locations in $selfieLoc[])
+	$ARGS[2] is for flashing when clothed if left blank then it is not flashing
+}
 if $ARGS[0] = 'Phone_selfie_image':
-	if $flashing = '':
+	if $ARGS[2] = '':
 		if $clothingworntype = 'swimwear':
 			!!changing to and unmixed variable so the rng will work
-			dynamic 'temp_swim = <<$phone_loc>>_swim'
-			phone_rand = rand(1,temp_swim)
-			!!Setting the image owned flag to 1
-			dynamic '<<$phone_loc>>_swim[<<phone_rand>>] = 1'
-			gs 'stat'
-			if usePopUps = 1:
-				msg '<img src="images/pc/selfies/<<$phone_loc>>/bikini/<<phone_rand>>.jpg">'
-			else
-				view 'images/pc/selfies/<<$phone_loc>>/bikini/<<phone_rand>>.jpg'
+			dynamic 'temp_swim = <<selfieSwimtot[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+			if temp_swim > 0:
+				phone_rand = rand(1,temp_swim)
+				!!Setting the image owned flag to 1
+				dynamic '<<$ARGS[1]>>_swim[<<phone_rand>>] = 1'
+				gs 'stat'
+				if usePopUps = 1:
+					msg '<img src="images/pc/selfies/<<$ARGS[1]>>/bikini/<<phone_rand>>.jpg">'
+				else
+					view 'images/pc/selfies/<<$ARGS[1]>>/bikini/<<phone_rand>>.jpg'
+				end
 			end
 		elseif $clothingworntype ! 'nude':
 			!!changing to and unmixed variable so the rng will work
-			dynamic 'temp_clotot = <<$phone_loc>>_clotot'
-			phone_rand = rand(1,temp_clotot)
-			!!Setting the image owned flag to 1
-			dynamic '<<$phone_loc>>_closelfie[<<phone_rand>>] = 1'
-			gs 'stat'
-			if usePopUps = 1:
-				msg '<img src="images/pc/selfies/<<$phone_loc>>/clothed/<<phone_rand>>.jpg">'
-			else
-				view 'images/pc/selfies/<<$phone_loc>>/clothed/<<phone_rand>>.jpg'
+			dynamic 'temp_clotot = <<selfieClotot[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+			if temp_clotot > 0:
+				phone_rand = rand(1,temp_clotot)
+				!!Setting the image owned flag to 1
+				dynamic '<<$ARGS[1]>>_closelfie[<<phone_rand>>] = 1'
+				gs 'stat'
+				if usePopUps = 1:
+					msg '<img src="images/pc/selfies/<<$ARGS[1]>>/clothed/<<phone_rand>>.jpg">'
+				else
+					view 'images/pc/selfies/<<$ARGS[1]>>/clothed/<<phone_rand>>.jpg'
+				end
 			end
 		elseif $pantyworntype ! 'none':
-			dynamic 'temp_undtot = <<$phone_loc>>_undtot'
-			phone_rand = rand(1,temp_undtot)
-			dynamic '<<$phone_loc>>_undselfie[<<phone_rand>>] = 1'
-			gs 'stat'
-			if usePopUps = 1:
-				msg '<img src="images/pc/selfies/<<$phone_loc>>/underwear/<<phone_rand>>.jpg">'
-			else
-				view 'images/pc/selfies/<<$phone_loc>>/underwear/<<phone_rand>>.jpg'
+			dynamic 'temp_undtot = <<selfieUndtot[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+			if temp_undtot > 0:
+				phone_rand = rand(1,temp_undtot)
+				dynamic '<<$ARGS[1]>>_undselfie[<<phone_rand>>] = 1'
+				gs 'stat'
+				if usePopUps = 1:
+					msg '<img src="images/pc/selfies/<<$ARGS[1]>>/underwear/<<phone_rand>>.jpg">'
+				else
+					view 'images/pc/selfies/<<$ARGS[1]>>/underwear/<<phone_rand>>.jpg'
+				end
 			end
 		else
-			dynamic 'temp_nudtot = <<$phone_loc>>_nudtot'
-			phone_rand = rand(1,temp_nudtot)
-			dynamic '<<$phone_loc>>_nudselfie[<<phone_rand>>] = 1'
-			gs 'stat'
-			if usePopUps = 1:
-				msg '<img src="images/pc/selfies/<<$phone_loc>>/nude/<<phone_rand>>.jpg">'
-			else
-				view 'images/pc/selfies/<<$phone_loc>>/nude/<<phone_rand>>.jpg'
+			dynamic 'temp_nudtot = <<selfieNudtot[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+			if temp_nudtot > 0:
+				phone_rand = rand(1,temp_nudtot)
+				dynamic '<<$ARGS[1]>>_nudselfie[<<phone_rand>>] = 1'
+				gs 'stat'
+				if usePopUps = 1:
+					msg '<img src="images/pc/selfies/<<$ARGS[1]>>/nude/<<phone_rand>>.jpg">'
+				else
+					view 'images/pc/selfies/<<$ARGS[1]>>/nude/<<phone_rand>>.jpg'
+				end
 			end
 		end
 	else
-		if $flashing = 'tits':
-			dynamic 'temp_titflash = <<$phone_loc>>_titflash'
-			phone_rand = rand(1,temp_titflash)
-			dynamic '<<$phone_loc>>_titflash[<<phone_rand>>] = 1'
-			gs 'stat'
-			if usePopUps = 1:
-				msg '<img src="images/pc/selfies/<<$phone_loc>>/titflash/<<phone_rand>>.jpg">'
-			else
-				view 'images/pc/selfies/<<$phone_loc>>/titflash/<<phone_rand>>.jpg'
+		if $ARGS[2] = 'tits':
+			dynamic 'temp_titflash = <<selfieTitflash[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+			if temp_titflash > 0:
+				phone_rand = rand(1,temp_titflash)
+				dynamic '<<$ARGS[1]>>_titflash[<<phone_rand>>] = 1'
+				gs 'stat'
+				if usePopUps = 1:
+					msg '<img src="images/pc/selfies/<<$ARGS[1]>>/titflash/<<phone_rand>>.jpg">'
+				else
+					view 'images/pc/selfies/<<$ARGS[1]>>/titflash/<<phone_rand>>.jpg'
+				end
 			end
-		elseif $flashing = 'ass':
-			dynamic 'temp_assflash = <<$phone_loc>>_assflash'
-			phone_rand = rand(1,temp_assflash)
-			dynamic '<<$phone_loc>>_assflash[<<phone_rand>>] = 1'
-			gs 'stat'
-			if usePopUps = 1:
-				msg '<img src="images/pc/selfies/<<$phone_loc>>/assflash/<<phone_rand>>.jpg">'
-			else
-				view 'images/pc/selfies/<<$phone_loc>>/assflash/<<phone_rand>>.jpg'
+		elseif $ARGS[2] = 'ass':
+			dynamic 'temp_assflash = <<selfieAssflash[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+			if temp_assflash > 0:
+				phone_rand = rand(1,temp_assflash)
+				dynamic '<<$ARGS[1]>>_assflash[<<phone_rand>>] = 1'
+				gs 'stat'
+				if usePopUps = 1:
+					msg '<img src="images/pc/selfies/<<$ARGS[1]>>/assflash/<<phone_rand>>.jpg">'
+				else
+					view 'images/pc/selfies/<<$ARGS[1]>>/assflash/<<phone_rand>>.jpg'
+				end
 			end
-		elseif $flashing = 'pussy':
-			dynamic 'temp_pussyflash = <<$phone_loc>>_pussyflash'
-			phone_rand = rand(1,temp_pussyflash)
-			dynamic '<<$phone_loc>>_pussyflash[<<phone_rand>>] = 1'
-			gs 'stat'
-			if usePopUps = 1:
-				msg '<img src="images/pc/selfies/<<$phone_loc>>/pussyflash/<<phone_rand>>.jpg">'
-			else
-				view 'images/pc/selfies/<<$phone_loc>>/pussyflash/<<phone_rand>>.jpg'
+		elseif $ARGS[2] = 'pussy':
+			dynamic 'temp_pussyflash = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+			if temp_pussyflash > 0:
+				phone_rand = rand(1,temp_pussyflash)
+				dynamic '<<$ARGS[1]>>_pussyflash[<<phone_rand>>] = 1'
+				gs 'stat'
+				if usePopUps = 1:
+					msg '<img src="images/pc/selfies/<<$ARGS[1]>>/pussyflash/<<phone_rand>>.jpg">'
+				else
+					view 'images/pc/selfies/<<$ARGS[1]>>/pussyflash/<<phone_rand>>.jpg'
+				end
 			end
 		end
-		$flashing = ''
 	end
 end
 
 !!taking selfies in the shower or bath
 if $ARGS[0] = 'Phone_selfie_image_bathing':
-	gs 'telefon', 'Phone_selfie_totals'
-	$phone_loc = 'bathroom'
 	minut += rand(5,7)
 	if $ARGS[1] = 'shower':
 		!!changing to and unmixed variable so the rng will work
-		dynamic 'temp_showertot = bathroom_showertot'
+		dynamic 'temp_showertot = <<selfieShowertot[arrpos(1, ''$selfieLoc'', ''bathroom'')]>>'
 		phone_rand = rand(1,temp_showertot)
 		!!Setting the image owned flag to 1
-		dynamic '<<$phone_loc>>_showerselfie[<<phone_rand>>] = 1'
+		dynamic 'bathroom_showerselfie[<<phone_rand>>] = 1'
 		gs 'stat'
 		if usePopUps = 1:
-			msg '<img src="images/pc/selfies/<<$phone_loc>>/shower/<<phone_rand>>.jpg">'
+			msg '<img src="images/pc/selfies/bathroom/shower/<<phone_rand>>.jpg">'
 		else
-			view 'images/pc/selfies/<<$phone_loc>>/shower/<<phone_rand>>.jpg'
+			view 'images/pc/selfies/bathroom/shower/<<phone_rand>>.jpg'
 		end
 	elseif $ARGS[1] = 'bath':
-		dynamic 'temp_bathtot = bathroom_bathtot'
+		dynamic 'temp_bathtot = <<selfieBathtot[arrpos(1, ''$selfieLoc'', ''bathroom'')]>>'
 		phone_rand = rand(1,temp_bathtot)
-		dynamic '<<$phone_loc>>_bathselfie[<<phone_rand>>] = 1'
+		dynamic 'bathroom_bathselfie[<<phone_rand>>] = 1'
 		gs 'stat'
 		if usePopUps = 1:
-			msg '<img src="images/pc/selfies/<<$phone_loc>>/bath/<<phone_rand>>.jpg">'
+			msg '<img src="images/pc/selfies/bathroom/bath/<<phone_rand>>.jpg">'
 		else
-			view 'images/pc/selfies/<<$phone_loc>>/bath/<<phone_rand>>.jpg'
+			view 'images/pc/selfies/bathroom/bath/<<phone_rand>>.jpg'
 		end
 	end
 end
 
 !!for taking photos - only selfies for now
 if $ARGS[0] = 'Phone_camera':
-	if $location_type = 'bathroom':
-		$phone_loc = 'bathroom'
-	elseif $locclass = 'bedr':
+	gs 'phone_selfies', 'Phone_selfie_totals'
+	if $locclass = 'bedr':
 		$phone_loc = 'bedroom'
 	elseif $locclass = 'kitr':
 		$phone_loc = 'kitchen'
@@ -1557,64 +1470,51 @@ if $ARGS[0] = 'Phone_camera':
 		$phone_loc = 'beach'
 	elseif $locclass = 'classroom':
 		$phone_loc = 'classroom'
+	elseif $locclass = 'school_bathroom':
+		$phone_loc = 'school_bathroom'
+	elseif $locclass = 'restroom':
+		$phone_loc = 'restroom'
+	elseif $location_type = 'bathroom':
+		$phone_loc = 'bathroom'
 	else
 		$phone_loc = ''
 	end
 	$telefon['body'] = '<font size=6>Camera</font><br>
 	<img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"><br><br>'
 	!! Take a selfie depending on which clothes you are wearing
-	$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'' "><b>Take a selfie</b></a><br>'
+	$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'', ''<<$phone_loc>>'' "><b>Take a selfie</b></a><br>'
 	!! Flashing selfie
-	if $clothingworntype ! 'nude' and ($phone_loc = 'bedroom' or $phone_loc = 'kitchen' or $phone_loc = 'livingroom' or $phone_loc = 'changingroom' or $phone_loc = 'city_park' or $phone_loc = 'lockeroom' or $phone_loc = 'beach'):
-		if $phone_loc = 'bedroom':
-			$telefon['body'] += '
-			<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''titflash'' "><b>Flash your tits for a selfie</b></a><br>
-			<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''assflash'' "><b>Flash your ass for a selfie</b></a><br>
-			<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''pussyflash'' "><b>Flash your pussy for a selfie</b></a><br>'
-		else
-			if pcs_inhib >= 35 or exhibitionist_lvl > 0:
-				$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''titflash'' "><b>Flash your tits for a selfie</b></a><br>'
-			end
-			if exhibitionist_lvl > 0:
-				$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''assflash'' "><b>Flash your ass for a selfie</b></a><br>'
-			end
-			if exhibitionist_lvl > 1:
-				$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''pussyflash'' "><b>Flash your pussy for a selfie</b></a><br>'
-			end
+	if $clothingworntype ! 'nude' and $phone_loc <> '':
+		locIndex = arrpos(1, '$selfieLoc', $phone_loc)
+		if (pcs_inhib >= 35 or exhibitionist_lvl > 0 or $phone_loc = 'bedroom') and dyneval("result = <<selfieTitflash[locIndex]>>") > 0:
+			$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', ''tits'' "><b>Flash your tits for a selfie</b></a><br>'
+		end
+		if (exhibitionist_lvl > 0 or $phone_loc = 'bedroom') and dyneval("result = <<selfieAssflash[locIndex]>>") > 0:
+			$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', ''ass'' "><b>Flash your ass for a selfie</b></a><br>'
+		end
+		if (exhibitionist_lvl > 1 or $phone_loc = 'bedroom') and dyneval("result = <<selfiePussyflash[locIndex]>>") > 0:
+			$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', ''pussy'' "><b>Flash your pussy for a selfie</b></a><br>'
 		end
 	end
 	dynamic $telefon['print']
 end
 
-if $ARGS[0] = 'titflash':
-	$flashing = 'tits'
-	gs 'telefon', 'Phone_camera_selfie'
-end
-
-if $ARGS[0] = 'assflash':
-	$flashing = 'ass'
-	gs 'telefon', 'Phone_camera_selfie'
-end
-
-if $ARGS[0] = 'pussyflash':
-	$flashing = 'pussy'
-	gs 'telefon', 'Phone_camera_selfie'
-end
-
 !!-----------------------------------end of Camera------------------------------------------
 
 !!-----------------------------------start of sms------------------------------------------
-! SMS
-! telefon['SMSCount'] = number of SMS messages
-! telefon['UnreadSMS'] = number of unread SMS messages
-! $SMSContact[] = NPC code for contact. ('A129', 'A29', 'B13', 'C14') that sent the sms
-! $SMSMessage[] = text for the sms message
-! $SMSTime[] = date time the message was received
-! $SMSPicture1[] = url for first picture sent as part of the message
-! $SMSPicture2[] = url for second picture sent as part of the message
-! $SMSPicture3[] = url for third picture sent as part of the message
-! $SMSPicture4[] = url for fourth picture sent as part of the message
-! SMSMessageRead[] = 0 unread, 1 read
+!{
+	SMS
+	telefon['SMSCount'] = number of SMS messages
+	telefon['UnreadSMS'] = number of unread SMS messages
+	$SMSContact[] = NPC code for contact. ('A129', 'A29', 'B13', 'C14') that sent the sms
+	$SMSMessage[] = text for the sms message
+	$SMSTime[] = date time the message was received
+	$SMSPicture1[] = url for first picture sent as part of the message
+	$SMSPicture2[] = url for second picture sent as part of the message
+	$SMSPicture3[] = url for third picture sent as part of the message
+	$SMSPicture4[] = url for fourth picture sent as part of the message
+	SMSMessageRead[] = 0 unread, 1 read
+}
 
 if $ARGS[0] = 'Phone_sms':
 	$telefon['body'] = '
@@ -1648,16 +1548,17 @@ if $ARGS[0] = 'Phone_sms':
 	killvar 'i'
 end &! --- Phone_sms ---
 
+!{ 
+	New SMS Message
+	If NPC is not in the contacts list of the phone it will be displayed as unknown until the contact has been added
+	$ARGS[1] = NPC code for contact. ('A129', 'A29', 'B13', 'C14')
+	$ARGS[2] = Message text to be displayed
+	$ARGS[3] = path to a picture to be displayed (optional)
+	$ARGS[4] = path to a picture to be displayed (optional)
+	$ARGS[5] = path to a picture to be displayed (optional)
+	$ARGS[6] = path to a picture to be displayed (optional)
+}
 if $ARGS[0] = 'add_sms':
-	! New SMS Message
-	! If NPC is not in the contacts list of the phone it will be displayed as unknown until the contact has been added
-	! $ARGS[1] = NPC code for contact. ('A129', 'A29', 'B13', 'C14')
-	! $ARGS[2] = Message text to be displayed
-	! $ARGS[3] = path to a picture to be displayed (optional)
-	! $ARGS[4] = path to a picture to be displayed (optional)
-	! $ARGS[5] = path to a picture to be displayed (optional)
-	! $ARGS[6] = path to a picture to be displayed (optional)
-
 	$SMSContact[telefon['SMSCount']] = $ARGS[1]
 	$SMSMessage[telefon['SMSCount']] = $ARGS[2]
 	$SMSTime[telefon['SMSCount']] = '<<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>> <<$week[week]>> <<day>> <<$month>> <<year>>'
@@ -1686,13 +1587,13 @@ end
 
 if $ARGS[0] = 'show_sms':
 	telefon['SMSid'] = ARGS[1]
-	!set to read and update the number of unread messages
+	!!set to read and update the number of unread messages
 	if SMSMessageRead[telefon['SMSid']] = 0:
 		telefon['UnreadSMS'] -= 1
 		SMSMessageRead[telefon['SMSid']] = 1
 	end
 
-	! Get image and name if in phone contacts otherwise show unknown
+	!! Get image and name if in phone contacts otherwise show unknown
 	telefon['contactid'] = arrpos('$contact',$SMSContact[telefon['SMSid']])
 	if telefon['contactid'] = -1:
 		$telefonCon['NPCName'] = ''
@@ -1702,11 +1603,11 @@ if $ARGS[0] = 'show_sms':
 		$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
 	end 
 
-	!If file extension is not given, .png is assumed
+	!!If file extension is not given, .png is assumed
 	if instr($telefonCon['Icon'],'.') = 0:
 		$telefonCon['Icon'] += '.png'
 	end
-	!If path is not given, default phone icon path is assumed
+	!!If path is not given, default phone icon path is assumed
 	if instr($telefonCon['Icon'],'/') = 0:
 		$telefonCon['Icon'] = 'images/system/phone/icons/' + $telefonCon['Icon']
 	end
@@ -1735,28 +1636,30 @@ if $ARGS[0] = 'show_sms':
 	dynamic $telefon['print']
 end
 
-! This is the formatting function for a row in the SMS message table. SHould be run as a DYNEVAL()
+!! This is the formatting function for a row in the SMS message table. SHould be run as a DYNEVAL()
+!{	
+	SMS Row in messages table
+	ARGS[0] = message id
+	$ARGS[1] = NPC icon
+	$ARGS[2] = NPC Nickname
+	$ARGS[3] = Time received
+	$ARGS[4] = 0 unread, 1 read
+}
 $telefon['SMS'] = {
-	! SMS Row in messages table
-	! ARGS[0] = message id
-	! $ARGS[1] = NPC icon
-	! $ARGS[2] = NPC Nickname
-	! $ARGS[3] = Time received
-	! $ARGS[4] = 0 unread, 1 read
 	telefon['SMSid'] = ARGS[0]
 	$telefon['ContactIcon'] = $ARGS[1]
 	$telefon['ContactNickName'] = $ARGS[2]
 	$telefon['SMSTime'] = $ARGS[3]
 	telefon['SMSStatus'] = ARGS[4]
-	!If file extension is not given, .png is assumed
+	!!If file extension is not given, .png is assumed
 	if instr($telefon['ContactIcon'],'.') = 0:
 		$telefon['ContactIcon'] += '.png'
 	end
-	!If path is not given, default phone icon path is assumed
+	!!If path is not given, default phone icon path is assumed
 	if instr($telefon['ContactIcon'],'/') = 0:
 		$telefon['ContactIcon'] = 'images/system/phone/icons/' + $telefon['ContactIcon']
 	end
-	! unread will be bold
+	!! unread will be bold
 	if telefon['SMSStatus'] = 0:
 		$telefon['SMSstyle1'] = '<b>'
 		$telefon['SMSstyle2'] = '</b>'
@@ -1846,8 +1749,8 @@ if $ARGS[0] = 'fin':
 end
 
 if $ARGS[0] = 'setup':
-	! array $$phonetheme_name is built.
-	! might need a tweak to have it rebuilt when new themes are available.
+	!! array $$phonetheme_name is built.
+	!! might need a tweak to have it rebuilt when new themes are available.
 
 	$phonetheme_name[0] = 'Custom_Standard'
 	$phonetheme_name[1] = 'Bimbo'