Explorar el Código

Merge remote-tracking branch 'hornguy6/master'

Kevin_Smarts hace 3 años
padre
commit
dfe35b3517

+ 4 - 4
locations/foto.qsrc

@@ -146,9 +146,9 @@ if $ARGS[0] = 'studio':
 	*clr & cla
 	killvar '$modelopt'
 
-	if special_model['status'] < min(city_modelling, 700) and modelfoto_topless > 0 and hour < 15 and fame_model_event ! daystart:gt 'foto_events','fame'
-	if special_skill_model['status'] < pcs_mdlng and modelfoto_nip > 0 and skill_model_event ! daystart:gt 'foto_events','skill'
-	if foto['documentary'] >= 95 and $pantyworntype = 'none' and modelfoto >= foto['documentary_timer']:gt'foto_model_documentary','1st_documentary'
+	if special_model['status'] < min(city_modelling, 700) and modelfoto['topless'] > 0 and hour < 15 and fame_model_event ! daystart:gt 'foto_events','fame'
+	if special_skill_model['status'] < pcs_mdlng and modelfoto['nip'] > 0 and skill_model_event ! daystart:gt 'foto_events','skill'
+	if foto['documentary'] >= 95 and $pantyworntype = 'none' and modelfoto['shoots']>= foto['documentary_timer']:gt'foto_model_documentary','1st_documentary'
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -1216,7 +1216,7 @@ if $ARGS[0] = 'end':
 	if practice_session = 0:
 		model_job_week += 1
 		model_week = (daystart - week) / 7
-		modelfoto += 1
+		modelfoto['shoots']+= 1
 		money += modelpayfin
 		modelfotomoney += modelpayfin
 	else

+ 38 - 38
locations/foto_events.qsrc

@@ -274,7 +274,7 @@ if $ARGS[0] = 'commercial':
 	if practice_session = 0:
 		model_job_week += 1
 		model_week = (daystart - week) / 7
-		modelfoto += 1
+		modelfoto['shoots'] += 1
 		money += modelpayfin
 		modelfotomoney += modelpayfin
 		gt 'foto','studio'
@@ -436,7 +436,7 @@ if $ARGS[0] = 'fashion_persuasion':
 			'The manager seems disappointed by your answer.'
 			'"So clothing or swimsuits today?"'
 			act'Clothing':
-				modelfoto_catalog += 1
+				modelfoto['catalog'] += 1
 				cla & *clr
 				mdlng_exp += rand(2,5)
 				minut += 120
@@ -448,7 +448,7 @@ if $ARGS[0] = 'fashion_persuasion':
 				act 'Leave':gt 'foto', 'end'
 			end
 			act'Swimsuits':
-				modelfoto_catalog += 1
+				modelfoto['catalog'] += 1
 				cla & *clr
 				mdlng_exp += rand(2,5)
 				minut += 120
@@ -810,7 +810,7 @@ if $ARGS[0] = 'topless_persuasion':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Thanks for the offer, but I think I''ll stick to what I''m doing for now."'
 			'"Oh. Okay..."'
-			if $shoot_type = 'trans_ling':
+			if $modelfoto['shoot_type'] = 'trans_ling':
 				act'Do the lingerie shoot':gt'foto_shoot','trans_ling'
 			else
 				act'Do the transparent shoot':gt'foto_shoot','transparent'
@@ -885,11 +885,11 @@ if $ARGS[0] = 'nude_persuasion':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Thanks for the offer, that''s really kind, but I think I''ll stick to what I''m doing for now."'
 			'"Oh. Okay..."'
-			if $shoot_type = 'topless':
+			if $modelfoto['shoot_type'] = 'topless':
 				act'Do the topless shoot':gt'foto_shoot','topless'
-			elseif $shoot_type = 'taste_nude':
+			elseif $modelfoto['shoot_type'] = 'taste_nude':
 				act'Do the tasteful nude shoot':gt'foto_shoot','tasteful'
-			elseif $shoot_type = 'top_nude':
+			elseif $modelfoto['shoot_type'] = 'top_nude':
 				act'Do the topless nude shoot':gt'foto_shoot','topless_nude'
 			end
 		end
@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'high_fashion':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/special1.jpg"></center>'
 			minut += 120
 			modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7))
-			modelfoto_pussy += 1
+			modelfoto['pussy'] += 1
 			mdlng_exp += rand(1,2)
 			if rand(0,1) = 1:
 				gs 'fame', 'city', 'modelling', 'medium'
@@ -1182,10 +1182,10 @@ if $ARGS[0] = 'fine_art2':
 	gs 'boyStat', $npclastgenerated
 	dick = 34
 	modelpayfin = 2000 + (modelpay * 2) + (50*rand(0,7))
-	modelfoto_nip += 1
-	modelfoto_topless += 1
-	modelfoto_nude += 1
-	modelfoto_pussy += 1
+	modelfoto['nip'] += 1
+	modelfoto['topless'] += 1
+	modelfoto['nude'] += 1
+	modelfoto['pussy'] += 1
 	mdlng_exp += rand(10,20)
 	if rand(0,1) = 1:
 		gs 'fame', 'city', 'modelling', 'medium'
@@ -1202,7 +1202,7 @@ if $ARGS[0] = 'fine_art2':
 		'"Yez! Yez! Just like zat! Now hold zat pozition just like zat!" In the corner of your tear-blurred vision, you see her click the remote and a ring of cameras flash around you, snapping simultaneously. Then, a red laser begin to scan you from bottom to top. The scanner works at an excruciatingly slow pace. It takes all of your willpower not to cry out, quiver, or scream in pain. You bite down hard on your lip, tears streaming down your face as it the only facial expression you can bear to maintain without moving.'
 		'The scan continues but at the edge of your hearing you can perceive a faint scratching sound. After a few minutes, you sink into despair when you realize that it''s the sound of drawing. She expects you to hold this position, hold this monstrously huge cock in your pussy without flinching. You want to whimper but fearing retribution you just bite down on your lip harder.'
 		act'Continue':
-			modelfoto += 1
+			modelfoto['shoots'] += 1
 			if fine_art_deal = 1:money += modelpayfin + 30000
 			if art_resign = 1:money += modelpayfin
 			if fine_art_deal = 1:modelfotomoney += modelpayfin + 30000
@@ -1311,8 +1311,8 @@ if $ARGS[0] = 'modern_art':
 				modelpayfin = 2000 + (50+rand(1,9)*rand(0,7))
 				money += modelpayfin
 				modelfotomoney += modelpayfin
-				modelfoto_topless += 1
-				modelfoto_nude += 1
+				modelfoto['topless'] += 1
+				modelfoto['nude'] += 1
 				mdlng_exp += rand(9,10)
 				if rand(0,1) = 1:
 					gs 'fame', 'city', 'modelling', 'medium'
@@ -1353,8 +1353,8 @@ if $ARGS[0] = 'aphrodite_advert':
 			modelpayfin = 1000
 			money += modelpayfin
 			modelfotomoney += modelpayfin
-			modelfoto_topless += 1
-			modelfoto_nude += 1
+			modelfoto['topless'] += 1
+			modelfoto['nude'] += 1
 			mdlng_exp += rand(1,10)
 			if rand(0,1) = 1:
 				gs 'fame', 'city', 'modelling', 'high'
@@ -1395,7 +1395,7 @@ if $ARGS[0] = 'independent_art':
 			modelpayfin = 1600 + (modelpay) + (35*rand(0,5))
 			money += modelpayfin
 			modelfotomoney += modelpayfin
-			modelfoto_nip += 1
+			modelfoto['nip'] += 1
 			mdlng_exp += rand(2,8)
 			if rand(0,1) = 1:
 				gs 'fame', 'city', 'modelling', 'medium'
@@ -1429,8 +1429,8 @@ if $ARGS[0] = 'designer_wedding':
 			modelpayfin = 1200 + (modelpay) + (35*rand(0,5))
 			money += modelpayfin
 			modelfotomoney += modelpayfin
-			modelfoto_nip += 1
-			modelfoto_pussy += 1
+			modelfoto['nip'] += 1
+			modelfoto['pussy'] += 1
 			mdlng_exp += rand(2,4)
 			if rand(0,1) = 1:
 				gs 'fame', 'city', 'modelling', 'medium'
@@ -1578,8 +1578,8 @@ if $ARGS[0] = 'topless1.1':
 								'You get dressed again while they load everything back into the van and then you all drive back to the studio. They drop you on the curb with your pay of <<modelpayfin>> <b>₽</b> for today''s work. You can see there''s even a little extra!'
 								money += modelpayfin
 								modelfotomoney += modelpayfin
-								modelfoto_nip += 1
-								modelfoto_topless += 1
+								modelfoto['nip'] += 1
+								modelfoto['topless'] += 1
 								mdlng_exp += rand(8,10)
 								gs 'fame', 'city', 'modelling', 'medium'
 								act'Leave':
@@ -1672,9 +1672,9 @@ if $ARGS[0] = 'pool1':
 						*clr & cla
 						minut += 180
 						modelpayfin = 3000 + modelpay + (50*rand(0,7))
-						modelfoto_nip += 1
-						modelfoto_topless += 1
-						modelfoto_nude += 1
+						modelfoto['nip'] += 1
+						modelfoto['topless'] += 1
+						modelfoto['nude'] += 1
 						mdlng_exp += 10
 						if rand(0,1) = 1:
 							gs 'fame', 'city', 'modelling', 'medium'
@@ -1786,8 +1786,8 @@ if $ARGS[0] = 'tennis':
 							modelpayfin = 2500 + (modelpay * 2) + (50*rand(0,7))
 							money += modelpayfin
 							modelfotomoney += modelpayfin
-							modelfoto_nip += 1
-							modelfoto_topless += 1
+							modelfoto['nip'] += 1
+							modelfoto['topless'] += 1
 							mdlng_exp += 8
 							if rand(0,1) = 1:
 								gs 'fame', 'city', 'modelling', 'medium'
@@ -1864,8 +1864,8 @@ if $ARGS[0] = 'topless2':
 							modelfotomoney += modelpayfin
 							gs 'fame', 'city', 'modelling', 'medium'
 							mdlng_exp += rand(8,10)
-							modelfoto_nip += 1
-							modelfoto_topless += 1
+							modelfoto['nip'] += 1
+							modelfoto['topless'] += 1
 							gs 'underwear', 'wear'
 							gs 'stat'
 							gs 'clothing', 'wear_last_worn'
@@ -1945,11 +1945,11 @@ if $ARGS[0] = 'beach2':
 								modelpayfin = 2500 + (modelpay * 2) + (50*rand(0,7))
 								money += modelpayfin + 1000
 								modelfotomoney += modelpayfin + 1000
-								modelfoto_topless += 1
+								modelfoto['topless'] += 1
 								gs 'fame', 'city', 'modelling', 'medium'
 								mdlng_exp += rand(8,10)
-								modelfoto_topless += 1
-								modelfoto_nip += 1
+								modelfoto['topless'] += 1
+								modelfoto['nip'] += 1
 								gs 'stat'
 								gs 'clothing', 'wear_last_worn'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down.jpg"></center>'
@@ -2018,8 +2018,8 @@ if $ARGS[0] = 'pool2':
 						modelfotomoney += modelpayfin
 						gs 'fame', 'city', 'modelling', 'medium'
 						mdlng_exp += rand(8,10)
-						modelfoto_topless += 1
-						modelfoto_nip += 1
+						modelfoto['topless'] += 1
+						modelfoto['nip'] += 1
 						gs 'underwear', 'wear'
 						gs 'stat'
 						gs 'clothing', 'wear_last_worn'
@@ -2127,7 +2127,7 @@ if $ARGS[0] = 'runway2':
 								gs 'fame', 'city', 'modelling', 'small'
 							end
 							mdlng_exp += rand(8,10)
-							modelfoto_nip += 1
+							modelfoto['nip'] += 1
 							gs'stat'
 							*clr & cla
 							model['runway_outfit'] = rand(1,5)
@@ -2234,9 +2234,9 @@ if $ARGS[0] = 'wet':
 						act'Continue':
 							cla
 							modelpayfin = 1000 + (modelpay * 2) + (50*rand(0,7))
-							modelfoto_nip += 1
-							modelfoto_topless += 1
-							modelfoto_nude += 1
+							modelfoto['nip'] += 1
+							modelfoto['topless'] += 1
+							modelfoto['nude'] += 1
 							if pcs_makeup > 1:pcs_makeup = 0
 							mdlng_exp += rand(9,10)
 							if rand(0,1) = 1:

+ 10 - 10
locations/foto_events2.qsrc

@@ -79,10 +79,10 @@ if $ARGS[0] = 'champagne1.2':
 	pcs_lipbalm += 8
 	modelpay = (pcs_mdlng/2 * 10) + min(fame['city_modelling'], 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-	modelfoto_nude += 1
-	modelfoto_fullnude += 1
-	modelfoto_nip += 1
-	modelfoto_pussy += 1
+	modelfoto['nude']  += 1
+	modelfoto['fullnude']  += 1
+	modelfoto['nip']  += 1
+	modelfoto['pussy']  += 1
 	mdlng_exp += rand(9,10)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 	'You walk over to the makeup department and the dressers get your hair and face ready before going to meet the photographer on set. Just before you leave, they have you slip on a gold thong and then send you on your way.'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'champagne1.2':
 				*clr & cla
 				pcs_sweat += 25
 				money += modelpayfin
-				modelfotomoney += modelpayfin
+				modelfoto['earnings']  += modelpayfin
 				gs 'fame', 'city', 'modelling', 'medium'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
@@ -136,13 +136,13 @@ if $ARGS[0] = 'kickboxing_documentary':
             '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD1.jpg"></center>'
             minut += 120
             modelpayfin = 900 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_kickboxing'] + pcs_apprnc)/2)*2
-            modelfoto_naked += 1
+            modelfoto['nude']  += 1
             mdlng_exp += rand(1,2)
 			gs 'fame', 'city', 'kickboxing', 'medium'
             gs 'fame', 'city', 'modelling', 'medium'
 			gs 'exhibitionism', 1
             money += modelpayfin
-            modelfotomoney += modelpayfin
+            modelfoto['earnings']  += modelpayfin
             inhib_exp += 2
             gs 'stat'
             'You aren''t the only one doing this documentay. Around you, walking between photographers, there are others kickboxers trying to follow the instructions to be "dynamic". Beyond that, the modeling, is fairlly artistic, showing skin, but hidding the important bits, between props and poses.'
@@ -210,13 +210,13 @@ if $ARGS[0] = 'track_&_field_documentary':
             '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD1.jpg"></center>'
             minut += 120
             modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_running'] + pcs_apprnc)/2)*2
-            modelfoto_naked += 1
+            modelfoto['nude']  += 1
             mdlng_exp += rand(1,2)
 			gs 'fame', 'city', 'running', 'small'
             gs 'fame', 'city', 'modelling', 'small'
             money += modelpayfin
-            modelfotomoney += modelpayfin
-            modelfoto_topless += 1
+            modelfoto['earnings']  += modelpayfin
+            modelfoto['topless']  += 1
             gs 'exhibitionism', 1
             gs 'stat'
             'You aren''t the only one doing this documentay. Around you, walking between photographers, there are other runners trying to follow the instructions to be "dynamic". Beyond that, the models, try to be fairlly artistic, showing skin, but hiding the important bits, between props and poses, sadlly with all the movement, that is easier said than done, and the security have their hands full, shooing away all the voyeurs trying to catch a peek.'

+ 1 - 1
locations/foto_models.qsrc

@@ -1741,7 +1741,7 @@ if $ARGS[0] = 'krystal_porn_card':
 		elseif krystal_porn['day'] < daystart - 1:
 			'"Where have you been babe?? I''ve been looking for you for days! Did you already do your two shoots for the week or something?" She extends her arm, holding out a small rectangular card between her fingers towards you. Taking it from her, you see it reads:'
 		end
-		killvar krystal_porn
+		killvar 'krystal_porn'
 		*nl
 		'	<b>Spunk Bang Productions</b>'
 		*nl

+ 0 - 2
locations/foto_practice.qsrc

@@ -359,7 +359,6 @@ if $ARGS[0] = 'transparent':
 
 				minut += 120
 				modelpayfin = 0
-				modelfoto_nip += 1
 				mdlng_exp += 1
 				inhib_exp += rand(1,4)
 				gs 'stat'
@@ -383,7 +382,6 @@ if $ARGS[0] = 'transparent':
 
 				minut += 120
 				modelpayfin = 0
-				modelfoto_nip += 1
 				mdlng_exp += 1
 				inhib_exp += rand(1,4)
 				gs 'stat'

+ 83 - 82
locations/foto_shoot.qsrc

@@ -41,20 +41,20 @@ if $ARGS[0] = 'model':
 		
 	act'"I''d like to do a catalog shoot"':
 		cla & *clr
-		if modelfoto >= 10 and pcs_mdlng > 20 and modelfoto_fashion < 1:gt'foto_events','fashion_persuasion'
+		if modelfoto['shoots'] >= 10 and pcs_mdlng > 20 and modelfoto['fashion'] < 1:gt'foto_events','fashion_persuasion'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'"Alright, what kind of shoot? Clothing or swimsuits?"'
 		
 		act'Clothing':
-			$shoot_type = 'catalog'
-			modelfoto += 1
-			modelfoto_catalog += 1
+			$modelfoto['shoot_type'] = 'catalog'
+			modelfoto['shoots']+= 1
+			modelfoto['catalog'] += 1
 			model_job_week += 1
 			mdlng_exp += rand(2,5)
 			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
 			money += 450
-			modelfotomoney += 450
+			modelfoto['earnings'] += 450
 			cla & *clr
 			if rand(1,2) = 1:
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/catalog/1.mp4"></video></center>'
@@ -68,15 +68,15 @@ if $ARGS[0] = 'model':
 			act 'Leave':gt 'foto', 'studio'
 		end
 		act'Swimsuits':
-			$shoot_type = 'swim_catalog'
-			modelfoto += 1
-			modelfoto_catalog += 1
+			$modelfoto['shoot_type'] = 'swim_catalog'
+			modelfoto['shoots']+= 1
+			modelfoto['catalog'] += 1
 			model_job_week += 1
 			mdlng_exp += rand(2,5)
 			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
 			money += 450
-			modelfotomoney += 450
+			modelfoto['earnings'] += 450
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,3)>>.mp4"></video></center>'
 			bikinicatalog += 1
@@ -95,8 +95,8 @@ if $ARGS[0] = 'model':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Alright, what kind of shoot would you like to do? Fashion, bikini, or lingerie?"'
 			act 'Fashion':
-				$shoot_type = 'fashion'
-				if modelfoto_fashion >= 10 and modelfoto_bikini + modelfoto_lingerie < 1 and modelfoto_glamour < 1 and modelfoto_nude < 1: gt'foto_events','lingerie_persuasion'
+				$modelfoto['shoot_type'] = 'fashion'
+				if modelfoto['fashion'] >= 10 and modelfoto['bikini'] + modelfoto['lingerie'] < 1 and modelfoto['glamour'] < 1 and modelfoto['nude'] < 1: gt'foto_events','lingerie_persuasion'
 				cla
 				act 'Look at something else':gt 'foto_shoot','model'
 
@@ -104,9 +104,9 @@ if $ARGS[0] = 'model':
 			end
 
 			act 'Bikini':
-				$shoot_type = 'bikini'
+				$modelfoto['shoot_type'] = 'bikini'
 				*clr & cla
-				if modelfoto_bikini + modelfoto_lingerie >= 10 and pcs_mdlng > 20 and modelfoto_glamour < 1 and modelfoto_nude < 1:gt'foto_events','glamour_persuasion'
+				if modelfoto['bikini'] + modelfoto['lingerie'] >= 10 and pcs_mdlng > 20 and modelfoto['glamour'] < 1 and modelfoto['nude'] < 1:gt'foto_events','glamour_persuasion'
 				if pcs_inhib < 20:
 					'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 					act 'Look at something else':gt 'foto_shoot','model'
@@ -131,9 +131,9 @@ if $ARGS[0] = 'model':
 
 
 			act 'Lingerie modelling':
-				$shoot_type = 'lingerie'
+				$modelfoto['shoot_type'] = 'lingerie'
 				*clr & cla
-				if modelfoto_bikini + modelfoto_lingerie >= 10 and modelfoto_glamour < 1 and modelfoto_nude < 1:gt'foto_events','glamour_persuasion'
+				if modelfoto['bikini'] + modelfoto['lingerie'] >= 10 and modelfoto['glamour'] < 1 and modelfoto['nude'] < 1:gt'foto_events','glamour_persuasion'
 				if pcs_inhib < 25:
 					'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 					act 'Look at something else':gt 'foto_shoot','model'
@@ -159,7 +159,7 @@ if $ARGS[0] = 'model':
 	end
 
 	act'"I''d like to do a glamour shoot"':
-		if pcs_inhib < 30 and modelfoto_glamour < 1:
+		if pcs_inhib < 30 and modelfoto['glamour'] < 1:
 			msg'You toy with the idea of exposing yourself on camera but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 		else
 			gt'foto_shoot', 'glamour_shoot'
@@ -167,7 +167,7 @@ if $ARGS[0] = 'model':
 	end
 	
 	act'"I''d like to do a nude shoot"':
-		if pcs_inhib < 30 and modelfoto_nude < 1:
+		if pcs_inhib < 30 and modelfoto['nude'] < 1:
 			msg'You toy with the idea of exposing yourself on camera but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 		else
 			gt'foto_shoot', 'nude_shoot'
@@ -196,7 +196,7 @@ end
 
 !!			minut += 120
 !!			modelpayfin = 700 + (modelpay) + (15*rand(0,5))
-!!			modelfoto_nip += 1
+!!			modelfoto['nip'] += 1
 !!			mdlng_exp += rand(6,10)
 !!			fame['city_modelling'] += rand(7,13)
 !!			pav_modelling += rand(1,fame['city_modelling'])/10
@@ -229,10 +229,10 @@ if $ARGS[0] = 'glamour_shoot':
 	'"Alright, we can do that. What kind of glamour shoot?"'
 	act 'Sexy clothing':
 		*clr & cla
-		$shoot_type = 'sexy_clo'
-		if modelfoto_ero_clo >= 10 and modelfoto_trans_ling + modelfoto_trans_ling < 1 and modelfoto_nip < 1 and modelfoto_nude < 1: gt'foto_events','trans_persuasion'
+		$modelfoto['shoot_type'] = 'sexy_clo'
+		if modelfoto['sexy'] >= 10 and modelfoto['trans_ling'] + modelfoto['trans_ling'] < 1 and modelfoto['nip'] < 1 and modelfoto['nude'] < 1: gt'foto_events','trans_persuasion'
 		if pcs_inhib < 30:
-			if modelfoto_ero_clo > 0:
+			if modelfoto['sexy'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
@@ -260,10 +260,10 @@ if $ARGS[0] = 'glamour_shoot':
 
 	act 'Transparent clothing':
 		*clr & cla
-		$shoot_type = 'trans_clo'
-		if modelfoto_trans_ling + modelfoto_transparent >= 5 and modelfoto_topless < 1 and modelfoto_nude < 1: gt'foto_events','topless_persuasion'
+		$modelfoto['shoot_type'] = 'trans_clo'
+		if modelfoto['trans_ling'] + modelfoto['transparent'] >= 5 and modelfoto['topless'] < 1 and modelfoto['nude'] < 1: gt'foto_events','topless_persuasion'
 		if pcs_inhib < 45:
-			if modelfoto_transparent > 0:
+			if modelfoto['transparent'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
@@ -291,11 +291,11 @@ if $ARGS[0] = 'glamour_shoot':
 	end
 	
 	act 'Transparent Lingerie':
-		$shoot_type = 'trans_ling'
+		$modelfoto['shoot_type'] = 'trans_ling'
 		*clr & cla
-		if modelfoto_trans_ling + modelfoto_transparent >= 5 and modelfoto_topless < 1 and modelfoto_nude < 1: $shoot_type = 'trans_ling' & gt'foto_events','topless_persuasion'
+		if modelfoto['trans_ling'] + modelfoto['transparent'] >= 5 and modelfoto['topless'] < 1 and modelfoto['nude'] < 1: $modelfoto['shoot_type'] = 'trans_ling' & gt'foto_events','topless_persuasion'
 		if pcs_inhib < 45:
-			if modelfoto_trans_ling > 0:
+			if modelfoto['trans_ling'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
@@ -323,11 +323,11 @@ if $ARGS[0] = 'glamour_shoot':
 	end
 
 	act 'Topless':
-		$shoot_type = 'topless'
+		$modelfoto['shoot_type'] = 'topless'
 		*clr & cla
-		if modelfoto_topless >= 5 and modelfoto_nude < 1: gt'foto_events','nude_persuasion'
+		if modelfoto['topless'] >= 5 and modelfoto['nude'] < 1: gt'foto_events','nude_persuasion'
 		if pcs_inhib < 50:
-			if modelfoto_topless > 0:
+			if modelfoto['topless'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
@@ -368,11 +368,11 @@ if $ARGS[0] = 'nude_shoot':
 	'"Alright, we can do that. What kind of nude shoot?"'
 	
 	act 'Tasteful nude':
-		$shoot_type = 'taste_nude'
+		$modelfoto['shoot_type'] = 'taste_nude'
 		*clr & cla
-		if modelfoto_tastenude >= 5 and modelfoto_topless + modelfoto_toplessnude + modelfoto_fullnude < 1: gt'foto_events','nude_persuasion'
+		if modelfoto['tastenude'] >= 5 and modelfoto['topless'] + modelfoto['topless']nude + modelfoto['fullnude'] < 1: gt'foto_events','nude_persuasion'
 		if pcs_inhib < 40:
-			if modelfoto_tastenude > 0:
+			if modelfoto['tastenude'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
@@ -400,11 +400,11 @@ if $ARGS[0] = 'nude_shoot':
 	end
 	
 	act 'Topless nude':
-		$shoot_type = 'top_nude'
+		$modelfoto['shoot_type'] = 'top_nude'
 		*clr & cla
-		if modelfoto_toplessnude >= 3 and modelfoto_pussy < 1:gt'foto_events','nude_persuasion'
+		if modelfoto['topless']nude >= 3 and modelfoto['pussy'] < 1:gt'foto_events','nude_persuasion'
 		if pcs_inhib < 55:
-			if modelfoto_toplessnude > 0:
+			if modelfoto['topless']nude > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
@@ -432,12 +432,12 @@ if $ARGS[0] = 'nude_shoot':
 	end
 	
 	act 'Full nude':
-		$shoot_type = 'full_nude'
+		$modelfoto['shoot_type'] = 'full_nude'
 		*clr & cla
 		if pcs_inhib < 60:
-			if modelfoto_fullnude > 0:
+			if modelfoto['fullnude'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more of these kinds of pictures of you floating around?'
-			elseif modelfoto_pussy < 1:
+			elseif modelfoto['pussy'] < 1:
 				'You think about asking to do this shoot but hesitate, not sure if you''re ready to put pictures of your pussy all over the internet.'
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
@@ -465,12 +465,12 @@ if $ARGS[0] = 'nude_shoot':
 	end
 	
 	act 'Erotic':
-		$shoot_type = 'erotic'
+		$modelfoto['shoot_type'] = 'erotic'
 		*clr & cla
 		if pcs_inhib < 65:
-			if modelfoto_pussy < 1:
+			if modelfoto['pussy'] < 1:
 				'You think about asking to do this shoot but hesitate, not sure if you''re ready to put pictures of your pussy and asshole all over the internet, especially ones that focus on them!'
-			elseif modelfoto_erotic >= 0:
+			elseif modelfoto['erotic'] >= 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
@@ -548,7 +548,7 @@ if $ARGS[0] = 'fashion':
 	*clr & cla
 	minut += 120
 	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
-	modelfoto_fashion += 1
+	modelfoto['fashion'] += 1
 	mdlng_exp += rand(5,8)
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
@@ -573,7 +573,7 @@ if $ARGS[0] = 'bikini':
 	*clr & cla
 	minut += 120
 	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
-	modelfoto_bikini += 1
+	modelfoto['bikini'] += 1
 	if pcs_inhib < 20: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
@@ -596,7 +596,7 @@ if $ARGS[0] = 'lingerie':
 	*clr & cla
 	minut += 120
 	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
-	modelfoto_lingerie += 1
+	modelfoto['lingerie'] += 1
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 25: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
@@ -622,8 +622,8 @@ if $ARGS[0] = 'sexy':
 	*clr & cla
 	minut += 120
 	modelpayfin = 500 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
-	modelfoto_glamour += 1
-	modelfoto_ero_clo += 1
+	modelfoto['glamour'] += 1
+	modelfoto['sexy'] += 1
 	mdlng_exp += rand(5,10)
 	if pcs_inhib < 30: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
@@ -645,9 +645,10 @@ if $ARGS[0] = 'transparent':
 	*clr & cla
 	minut += 120
 	modelpayfin = 600 + (modelpay) + (pcs_apprnc) + (15*rand(0,5))
-	modelfoto_glamour += 1
-	modelfoto_transparent += 1
-	modelfoto_nip += 1
+	modelfoto['glamour'] += 1
+	modelfoto['sexy'] 
+	modelfoto['transparent'] += 1
+	modelfoto['nip'] += 1
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 45: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
@@ -669,10 +670,10 @@ if $ARGS[0] = 'trans_ling':
 	*clr & cla
 	minut += 120
 	modelpayfin = 650 + (modelpay * 2) + (pcs_apprnc) + (15*rand(0,7))
-	modelfoto_glamour += 1
-	modelfoto_trans_ling += 1
-	modelfoto_nip += 1
-	modelfoto_lingerie += 1
+	modelfoto['glamour'] += 1
+	modelfoto['trans_ling'] += 1
+	modelfoto['nip'] += 1
+	modelfoto['lingerie'] += 1
 	mdlng_exp += rand(8,10)
 	if pcs_inhib < 45: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
@@ -700,8 +701,8 @@ if $ARGS[0] = 'topless':
 	*clr & cla
 	minut += 120
 	modelpayfin = 700 + (modelpay) + (pcs_apprnc) + (15*rand(0,5))
-	modelfoto_nip += 1
-	modelfoto_topless += 1
+	modelfoto['nip'] += 1
+	modelfoto['topless'] += 1
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 50: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
@@ -724,8 +725,8 @@ if $ARGS[0] = 'tasteful':
 	minut += 120
 	modelpay = (pcs_mdlng/2 * 10) + min(fame['city_modelling'], 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-	modelfoto_tastenude += 1
-	modelfoto_nude += 1
+	modelfoto['tastenude'] += 1
+	modelfoto['nude'] += 1
 	mdlng_exp += rand(9,10)
 	if pcs_inhib < 40: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
@@ -747,8 +748,8 @@ if $ARGS[0] = 'topless_nude':
 	minut += 120
 	modelpay = (pcs_mdlng/2 * 10) + min(fame['city_modelling'], 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-	modelfoto_nude += 1
-	modelfoto_toplessnude += 1
+	modelfoto['nude'] += 1
+	modelfoto['topless']nude += 1
 	mdlng_exp += rand(9,10)
 	if pcs_inhib < 55: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'medium'
@@ -770,11 +771,11 @@ if $ARGS[0] = 'nude':
 	minut += 120
 	modelpay = (pcs_mdlng/2 * 10) + min(fame['city_modelling'], 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-	if modelfoto_nude = 0: modelpayfin = modelpayfin * 2 & foto_persuade = 0
-	modelfoto_nude += 1
-	modelfoto_fullnude += 1
-	modelfoto_nip += 1
-	modelfoto_pussy += 1
+	if modelfoto['nude'] = 0: modelpayfin = modelpayfin * 2 & foto_persuade = 0
+	modelfoto['nude'] += 1
+	modelfoto['fullnude'] += 1
+	modelfoto['nip'] += 1
+	modelfoto['pussy'] += 1
 	mdlng_exp += rand(9,10)
 	if pcs_inhib < 60: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'medium'
@@ -791,9 +792,9 @@ if $ARGS[0] = 'nude':
 		*nl
 		'You spend two hours posing confidently for a photographer taking pictures of you, your <<$pcdesc_pubes>> pussy providing a nice contrast to the rest of your smooth body. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 	end
-	if modelfoto_nude = 1 and foto_persuade ! 5:
+	if modelfoto['nude'] = 1 and foto_persuade ! 5:
 		'You blink at the amount but the person who gave it to you reassures you it''s normal. The studio has a policy of doubling the pay for a model''s nude debut.'
-	elseif modelfoto_nude = 1 and foto_persuade = 5:
+	elseif modelfoto['nude'] = 1 and foto_persuade = 5:
 		'It even includes the bonus the manager said they''d give you for your debut!'
 	end
 
@@ -809,11 +810,11 @@ if $ARGS[0] = 'erotic':
 	minut += 120
 	modelpay = (pcs_mdlng/2 * 10) + (pcs_apprnc * 3)
 	modelpayfin = 1000 + (modelpay * 2) + (15*rand(0,5))
-	modelfoto_erotic += 1
-	modelfoto_nude += 1
-	modelfoto_nip += 1
-	modelfoto_pussy += 1
-	modelfoto_asshole += 1
+	modelfoto['erotic'] += 1
+	modelfoto['nude'] += 1
+	modelfoto['nip'] += 1
+	modelfoto['pussy'] += 1
+	modelfoto['asshole'] += 1
 	mdlng_exp += rand(1,4)
 	if pcs_inhib < 65: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
@@ -839,7 +840,7 @@ if $ARGS[0] = 'sportswear':
 	*clr & cla
 	minut += 120
 	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (fame['city_modelling']/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
-	modelfoto_fitness += 1
+	modelfoto['fitness'] += 1
 	pcs_sweat = 60
 	mdlng_exp += rand(2,4)
 	gs 'fame', 'city', 'modelling', 'small'
@@ -867,7 +868,7 @@ if $ARGS[0] = 'sports_underwear':
 	*clr & cla
 	minut += 120
 	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (fame['city_modelling']/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
-	modelfoto_fitness += 1
+	modelfoto['fitness'] += 1
 	pcs_sweat = 60
 	gs 'fame', 'city', 'modelling', 'small'
 	mdlng_exp += rand(3,6)
@@ -893,8 +894,8 @@ if $ARGS[0] = 'fitness_artistic_nude':
 	minut += 120
 	modelpay = (pcs_mdlng/2 * 10) + fame['city_modelling'] + pcs_apprnc + city_sport
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-	modelfoto_fitness += 1
-	modelfoto_nude += 1
+	modelfoto['fitness'] += 1
+	modelfoto['nude'] += 1
 	pcs_sweat = 60
 	mdlng_exp += rand(4,5)
 	gs 'fame', 'city', 'modelling', 'small'
@@ -931,12 +932,12 @@ end
 !!				fame['city_modelling'] += rand(10,20)
 !!				pav_modelling += rand(0,fame['city_modelling'])/10
 !!				inhib_exp += 3
-!!				modelfoto_glamour += 1
-!!				modelfoto_nip += 1
-!!				modelfoto_fashion += 1
-!!				modelfoto_lingerie += 1
-!!				modelfoto_topless += 1
-!!				modelfoto_pussy += 1
+!!				modelfoto['glamour'] += 1
+!!				modelfoto['nip'] += 1
+!!				modelfoto['fashion'] += 1
+!!				modelfoto['lingerie'] += 1
+!!				modelfoto['topless'] += 1
+!!				modelfoto['pussy'] += 1
 !!				gs 'stat'
 !!				'<center><video autoplay loop src="images/locations/city/citycenter/photo/vmodel.mp4"></video></center>'
 !!				'You spend two hours posing for the photographer, changing in and out of various underwear, sexy clothings, and lingeries until you end the shoot fully striped down and dancing naked.'

+ 4 - 4
locations/hookup.qsrc

@@ -1,5 +1,5 @@
 # hookup
-2021/05/06
+!! 2021/05/06
 if $ARGS[0] = 'start':
 	$location_type = 'indoors'
 	if CloDress > 0:hookup['dress'] = 1
@@ -1216,9 +1216,9 @@ if $ARGS[0] = 'lick_pussy':
 						act'Blow him':gt'hookup','bj'
 					end
 					
-					act'Well... I guess you can fuck me...':
+					act'You earned it':
 						cla & *nl
-						'"Well... I guess it''s only fair," you say. You motion for him to join you on the bed.'
+						'"Well... I guess you did earn it," you smile tiredly, motioning for him to join you on the bed.'
 						gs'hookup','condoms'
 						gs'hookup','position_choose'
 					end
@@ -2311,7 +2311,7 @@ end
 
 
 if $ARGS[0] = 'virgin_condom4':
-	if will_cost <= pcs_willpwr and prezikcount + prezik > 0:
+	if will_cost <= pcs_willpwr and (prezikcount + prezik > 0):
 		act'Put a condom on him (<<will_cost>> Willpower)':
 			gs 'willpower','pay','self'
 			gs 'stat'

+ 20 - 18
locations/obj_din.qsrc

@@ -580,25 +580,27 @@ if $ARGS[0] = 'stats':
 	if modelfoto > 0:
 		'<b>Modelling</b>'
 		*nl
-		'<<modelfoto>> - Number of times you have worked as a model'
-		'<<modelfotomoney>> - The amount of money you''ve made modelling'
+		'<<modelfoto[''shoots'']>> - Number of times you have worked as a model'
+		'<<<modelfoto[''earnings'']>> - The amount of money you''ve made modelling'
 		*nl
-		if modelfoto_catalog > 0: '<<modelfoto_catalog>> - Number of catalog shoots you''ve done'
-		if modelfoto_fashion > 0: '<<modelfoto_fashion>> - Number of fashion shoots you''ve done'
-		if modelfoto_ero_clo > 0: '<<modelfoto_ero_clo>> - Number of sexy clothing shoots you''ve done'
-		if modelfoto_bikini > 0: '<<modelfoto_bikini>> - Number of swimsuit shoots you''ve done'
-		if modelfoto_lingerie > 0: '<<modelfoto_lingerie>> - Number of lingerie shoots you''ve done'
-		if modelfoto_fitness > 0: '<<modelfoto_fitness>> - Number of fitness shoots you have participated in'
-		if modelfoto_glamour > 0: '<<modelfoto_glamour>> - Number of glamour shoots you''ve done'
-		if modelfoto_topless > 0: '<<modelfoto_topless>> - Number of topless shoots you''ve done'
-		if modelfoto_nude > 0: '<<modelfoto_nude>> - Number of shoots in which you have been nude'
-		if modelfoto_tastenude > 0: '<<modelfoto_tastenude>> - Number of shoots in which you have been nude but not shown breasts or pussy'
-		if modelfoto_toplessnude > 0: '<<modelfoto_toplessnude>> - Number of nude shoots you have shown your breasts but not your pussy'
-		if modelfoto_fullnude > 0: '<<modelfoto_fullnude>> - Number of full frontal nude shoots you''ve done'
-		if modelfoto_erotic > 0: '<<modelfoto_erotic>> - Number of softcore erotic shoots you''ve done'
-		if modelfoto_nip > 0: '<<modelfoto_nip>> - Number of shoots your nipples have been visible'
-		if modelfoto_pussy > 0: '<<modelfoto_pussy>> - Number of shoots your pussy has been visible'
-		if modelfoto_asshole > 0: '<<modelfoto_asshole>> - Number of shoots your asshole has been visible'
+		if modelfoto_catalog > 0: '<<modelfoto[''catalog'']>> - Number of catalog shoots you''ve done'
+		if modelfoto_fashion > 0: '<<modelfoto[''fashion'']>> - Number of fashion shoots you''ve done'
+		if modelfoto_ero_clo > 0: '<<modelfoto[''sexy'']>> - Number of sexy clothing shoots you''ve done'
+		if modelfoto_bikini > 0: '<<modelfoto[''bikini'']>> - Number of swimsuit shoots you''ve done'
+		if modelfoto_lingerie > 0: '<<modelfoto[''lingerie'']>> - Number of lingerie shoots you''ve done'
+		if modelfoto_trans_ling > 0: '<<modelfoto[''trans_ling'']>> - Number of transparent lingerie shoots you''ve done'
+		if modelfoto_transparent > 0: '<<modelfoto[''transparent'']>> - Number of transparent clothing shoots you''ve done'
+		if modelfoto_fitness > 0: '<<modelfoto[''fitness'']>> - Number of fitness shoots you have participated in'
+		if modelfoto_glamour > 0: '<<modelfoto[''glamour'']>> - Number of glamour shoots you''ve done'
+		if modelfoto_topless > 0: '<<modelfoto[''topless'']>> - Number of topless shoots you''ve done'
+		if modelfoto_nude > 0: '<<modelfoto[''nude'']>> - Number of shoots in which you have been nude'
+		if modelfoto_tastenude > 0: '<<modelfoto[''tastenude'']>> - Number of shoots in which you have been nude but not shown breasts or pussy'
+		if modelfoto_toplessnude > 0: '<<modelfoto[''toplessnude'']>> - Number of nude shoots you have shown your breasts but not your pussy'
+		if modelfoto_fullnude > 0: '<<modelfoto[''fullnude'']>> - Number of full frontal nude shoots you''ve done'
+		if modelfoto_erotic > 0: '<<modelfoto[''erotic'']>> - Number of softcore erotic shoots you''ve done'
+		if modelfoto_nip > 0: '<<modelfoto[''nip'']>> - Number of shoots your nipples have been visible'
+		if modelfoto_pussy > 0: '<<modelfoto[''pussy'']>> - Number of shoots your pussy has been visible'
+		if modelfoto_asshole > 0: '<<modelfoto[''asshole'']>> - Number of shoots your asshole has been visible'
 	end
 	
 	*nl

+ 23 - 0
locations/saveupdater.qsrc

@@ -1169,7 +1169,30 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 
 end
 
+if modelfoto > 0:
+	!! changing modelling variables to arrays
+	if modelfoto > 0: modelfoto['shoots'] = modelfoto
+	if modelfotomoney > 0: modelfoto['earnings'] = modelfotomoney
+	if modelfoto_catalog > 0: modelfoto['catalog'] = modelfoto_catalog
+	if modelfoto_fashion > 0: modelfoto['fashion'] = modelfoto_fashion
+	if modelfoto_ero_clo > 0: modelfoto['sexy'] = modelfoto_ero_clo
+	if modelfoto_bikini > 0: modelfoto['bikini'] = modelfoto_bikini
+	if modelfoto_lingerie > 0: modelfoto['lingerie'] = modelfoto_lingerie
+	if modelfoto_trans_ling > 0: modelfoto['trans_ling'] = modelfoto_trans_ling
+	if modelfoto_transparent > 0: modelfoto['transparent'] = modelfoto_transparent
+	if modelfoto_fitness > 0: modelfoto['fitness'] = modelfoto_fitness
+	if modelfoto_glamour > 0: modelfoto['glamour'] = modelfoto_glamour
+	if modelfoto_topless > 0: modelfoto['topless'] = modelfoto_topless
+	if modelfoto_nude > 0: modelfoto['nude'] = modelfoto_nude
+	if modelfoto_tastenude > 0: modelfoto['tastenude'] = modelfoto_tastenude
+	if modelfoto_toplessnude > 0: modelfoto['toplessnude'] = modelfoto_toplessnude
+	if modelfoto_fullnude > 0: modelfoto['fullnude'] = modelfoto_fullnude
+	if modelfoto_erotic > 0: modelfoto['erotic'] = modelfoto_erotic
+	if modelfoto_nip > 0: modelfoto['nip'] = modelfoto_nip
+	if modelfoto_pussy > 0: modelfoto['pussy'] = modelfoto_pussy
+	if modelfoto_asshole > 0: modelfoto['asshole'] = modelfoto_asshole
 
+end
 
 gs 'saveg'
 --- saveupdater ---------------------------------