Merge remote-tracking branch 'hornguy6/master'

locations/foto_events.qsrc

@@ -3,7 +3,7 @@
 menu_off = 1
 
 if $ARGS[0] = 'fame':
-	modelpay = (pcs_mdlng/2 * 10) + ((min(city_modelling, 700) + pcs_apprnc)/2)
+	modelpay = (pcs_mdlng/2 * 10) + ((min(fame['city_modelling'], 700) + pcs_apprnc)/2)
 	:reroll_1
 	special_model = 2000
 	special_skill_model = 2000
@@ -27,7 +27,7 @@ if $ARGS[0] = 'fame':
 end
 
 if $ARGS[0] = 'skill':
-	modelpay = (pcs_mdlng/2 * 10) + ((min(city_modelling, 700) + pcs_apprnc)/2)
+	modelpay = (pcs_mdlng/2 * 10) + ((min(fame['city_modelling'], 700) + pcs_apprnc)/2)
 	:reroll_2
 	special_model = 2000
 	special_skill_model = 2000
@@ -944,7 +944,7 @@ end
 !!------------------------------------------------------------------- Special Modelling Jobs ------------------------------------------------------------------
 
 if $ARGS[0] = 'special':
-	modelpay = (pcs_mdlng/2 * 25) + (func('shortgs','sqrt', min(city_modelling, 700)) * 50) + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 25) + (func('shortgs','sqrt', min(fame['city_modelling'], 700)) * 50) + pcs_apprnc
 	if specialmodelrequest ! daystart:
 		specialmodelrequest = daystart
 		specialjob1 = rand(1,100)
@@ -1014,8 +1014,11 @@ if $ARGS[0] = 'high_fashion':
 			modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7))
 			modelfoto_pussy += 1
 			mdlng_exp += rand(1,2)
-			city_modelling += rand(5,25)
-			pav_modelling += rand(0,city_modelling)/6
+			if rand(0,1) = 1:
+				gs 'fame', 'city', 'modelling', 'medium'
+			else
+				gs 'fame', 'city', 'modelling', 'small'
+			end
 			money += modelpayfin
 			modelfotomoney += modelpayfin
 			'You spend the duration of the shoot changing in and out of designer bodices, corsets, and other tops, all of which conspicuously lack any kind of bottom, leaving your pussy exposed.'
@@ -1184,7 +1187,11 @@ if $ARGS[0] = 'fine_art2':
 	modelfoto_nude += 1
 	modelfoto_pussy += 1
 	mdlng_exp += rand(10,20)
-	city_modelling += rand(1,20)
+	if rand(0,1) = 1:
+		gs 'fame', 'city', 'modelling', 'medium'
+	else
+		gs 'fame', 'city', 'modelling', 'small'
+	end
 	if fine_art_deal = 1 or fine_art_deal = 2:
 		gs 'arousal', 'vaginal', 1
 		gs 'stat'
@@ -1307,7 +1314,11 @@ if $ARGS[0] = 'modern_art':
 				modelfoto_topless += 1
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
-				city_modelling += rand(1,21)
+				if rand(0,1) = 1:
+					gs 'fame', 'city', 'modelling', 'medium'
+				else
+					gs 'fame', 'city', 'modelling', 'small'
+				end
 				modern_art_projet = 1
 				pcs_horny += 20
 				'The girl has you and the other model lie down on your sides and then wrap your legs your heads, both of you grabbing the other''s foot with your hand in a way that allows you to perfectly mirror each other''s position. At the client''s insistence, you bury your face between the other girl''s legs. The aroma of her sex fills your nostrils and you can feel her breath on your own pussy as well.'
@@ -1345,8 +1356,11 @@ if $ARGS[0] = 'aphrodite_advert':
 			modelfoto_topless += 1
 			modelfoto_nude += 1
 			mdlng_exp += rand(1,10)
-			city_modelling += rand(40,60)
-			pav_modelling += rand(0,city_modelling)/4
+			if rand(0,1) = 1:
+				gs 'fame', 'city', 'modelling', 'high'
+			else
+				gs 'fame', 'city', 'modelling', 'medium'
+			end
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/group.jpg"></center>'
 			'You go to the designated set and find the other girls waiting there, idling chatting to each other and gossiping. You join them and when the head photographer shows up, he begins to give you all instructions.'
@@ -1383,7 +1397,11 @@ if $ARGS[0] = 'independent_art':
 			modelfotomoney += modelpayfin
 			modelfoto_nip += 1
 			mdlng_exp += rand(2,8)
-			city_modelling += rand(12,16)
+			if rand(0,1) = 1:
+				gs 'fame', 'city', 'modelling', 'medium'
+			else
+				gs 'fame', 'city', 'modelling', 'small'
+			end
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/art3.jpg"></center>'
 			'You go to the designated set where you find several other girls dressed in graceful and sophisticated clothing that is also completely sheer. At your approach, you are directed to put on one of these outfits yourself and get your hair done by the team of the makeup artists present.'
@@ -1414,7 +1432,11 @@ if $ARGS[0] = 'designer_wedding':
 			modelfoto_nip += 1
 			modelfoto_pussy += 1
 			mdlng_exp += rand(2,4)
-			city_modelling += rand(8,16)
+			if rand(0,1) = 1:
+				gs 'fame', 'city', 'modelling', 'medium'
+			else
+				gs 'fame', 'city', 'modelling', 'small'
+			end
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/wedding.jpg"></center>'
 			'You go to set 12 where you put on the "dress" which really <i>is</i> just stockings, gloves, and a veil. You and the photographer spend about an hour in a few poses, including a few that have pulled back the bra and panties before wrapping up.'
@@ -1559,8 +1581,7 @@ if $ARGS[0] = 'topless1.1':
 								modelfoto_nip += 1
 								modelfoto_topless += 1
 								mdlng_exp += rand(8,10)
-								city_modelling += 20
-								pav_modelling += rand(0,city_modelling)/10
+								gs 'fame', 'city', 'modelling', 'medium'
 								act'Leave':
 									msg'You''ve shown the studio that you''re willing to go above and beyond what is normally asked of you and that you''re willing to capitalize on your popularity as a model. The photographers might come to you for more off-site shoots like this in the future. Additionally, you are now considered a viable candidate for special requests that might be asked of the studio. Each day there may or may not be such work available for you. Check with the photographers if you want to supplement your income with these specialized jobs.'
 									gt'city_center'
@@ -1587,20 +1608,20 @@ if $ARGS[0] = 'pool1':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"What''s up?"'
-			if city_modelling < 100:
+			if fame['city_modelling'] < 100:
 				'"We''ve been hearing good things about you lately. Even though you''re pretty new to the industry, we keep hearing your name pop up. Must mean that you''re starting to get recognized and asked for. So that being said, we''d like to do an offsite shoot today to feature you in an upcoming special issue."'
-			elseif city_modelling >= 100 and city_modelling < 200:
+			elseif fame['city_modelling'] >= 100 and fame['city_modelling'] < 200:
 				'"You''re really starting to make a name for yourself. We''ve even had a few journalists come to the studio asking about you. So that being said, we''d like to do an offsite shoot today so we can feature you in an upcoming special issue.""'
-			elseif city_modelling >= 200:
+			elseif fame['city_modelling'] >= 200:
 				'"I was hoping to get you for a shoot today. We have an upcoming special issue and we wanted you to feature in it so we can put your name on the cover to increase sales."'
 			end
 			'"What kind of shoot?"'
-			if city_modelling < 200:
+			if fame['city_modelling'] < 200:
 				'"A nude pool shoot with you and a few of the other name girls we have here. You''ll all have equal part in it but you''ll all also get your own exclusive sections within the spread. This won''t count as your weekly shoot so you''ll get paid for it and it''s sure to give you a bump of fame as well. How about it?"'
-			elseif city_modelling >= 200:
+			elseif fame['city_modelling'] >= 200:
 				'"A nude pool shoot with you and a few rising girls. We''re hoping that the people who read the issue for you will help get exposure to these other girls, increase their profile. Even so, it''ll still be good publicity for you too. You''ve been working with us long enough that you know the drill and you''ll get paid for this. Are you in?"'
 			end
-			if city_modelling < 100:
+			if fame['city_modelling'] < 100:
 				gs 'willpower', 'exhib', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
 					act'"I''m not interested in getting famous" (<<will_cost>> Willpower)':
@@ -1655,8 +1676,11 @@ if $ARGS[0] = 'pool1':
 						modelfoto_topless += 1
 						modelfoto_nude += 1
 						mdlng_exp += 10
-						city_modelling += 35
-						pav_modelling += rand(0,city_modelling)/4
+						if rand(0,1) = 1:
+							gs 'fame', 'city', 'modelling', 'medium'
+						else
+							gs 'fame', 'city', 'modelling', 'small'
+						end
 						pcs_mood += 5
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame/pool.mp4"></video></center>'
 						'You spend various portions of the next few hours in and around the pool. Sometimes by yourself, sometimes with the other girls in the background. Eventually your portion of the shoot is over and you spend the rest of the time lazing on a chaise lounge while the other girls finish up. It''s so comfortable, you couldn''t care less when the photographers decide to snap a few more pictures of you and your invitingly exposed ass.'
@@ -1691,14 +1715,14 @@ if $ARGS[0] = 'tennis':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"What''s up?"'
-			if city_modelling < 100:
+			if fame['city_modelling'] < 100:
 				'"You''re pretty athletic right? We wanted a girl to help us with a sports issue. Your name has been coming up more and more often so we thought you''d be a good choice."'
 				'"What would I be doing? What sport?"'
 				'"Tennis. We''re doing a bit of video for this shoot and you''d be doing tennis swings in slow motion. The thing is, we really do want someone who looks like they know what they''re doing, so that''s why we''d like to have you over someone else. Think you''re up for it? I think it would really increase your exposure and your profile."'
-			elseif city_modelling >= 100:
+			elseif fame['city_modelling'] >= 100:
 				'"You like tennis right? Some other magazines were talking about how much you liked the sport so we thought it''d be good put out some special material featuring you doing some tennis swings. We''re talking photography and video here. We think it''d be good publicity for you. What do you think? Want to do it?"'
 			end
-			if city_modelling < 100:
+			if fame['city_modelling'] < 100:
 				gs 'willpower', 'exhib', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
 					act'"I''m not actually that into tennis..." (<<will_cost>> Willpower)':
@@ -1765,8 +1789,11 @@ if $ARGS[0] = 'tennis':
 							modelfoto_nip += 1
 							modelfoto_topless += 1
 							mdlng_exp += 8
-							city_modelling += 35
-							pav_modelling += rand(0,city_modelling)/4
+							if rand(0,1) = 1:
+								gs 'fame', 'city', 'modelling', 'medium'
+							else
+								gs 'fame', 'city', 'modelling', 'small'
+							end
 							'Eventually the shoot is over and they thank you for agreeing to do the shoot for them. They thank you even more when they play it back in slow motion. After they''re done time warp ogling your bouncing breasts, they pay you <<modelpayfin>> <b>₽</b> and thank you one more time when they play the recordings back again.'
 							act'Back to the studio':gt'foto','studio'
 						end
@@ -1835,7 +1862,7 @@ if $ARGS[0] = 'topless2':
 							modelpayfin = 2000 + (modelpay * 2) + (35*rand(0,5))
 							money += modelpayfin
 							modelfotomoney += modelpayfin
-							city_modelling += 15
+							gs 'fame', 'city', 'modelling', 'medium'
 							mdlng_exp += rand(8,10)
 							modelfoto_nip += 1
 							modelfoto_topless += 1
@@ -1919,7 +1946,7 @@ if $ARGS[0] = 'beach2':
 								money += modelpayfin + 1000
 								modelfotomoney += modelpayfin + 1000
 								modelfoto_topless += 1
-								city_modelling += 15
+								gs 'fame', 'city', 'modelling', 'medium'
 								mdlng_exp += rand(8,10)
 								modelfoto_topless += 1
 								modelfoto_nip += 1
@@ -1989,7 +2016,7 @@ if $ARGS[0] = 'pool2':
 						modelpayfin = 2500 + (modelpay * 2) + (50*rand(0,7))
 						money += modelpayfin
 						modelfotomoney += modelpayfin
-						city_modelling += 15
+						gs 'fame', 'city', 'modelling', 'medium'
 						mdlng_exp += rand(8,10)
 						modelfoto_topless += 1
 						modelfoto_nip += 1
@@ -2093,9 +2120,12 @@ if $ARGS[0] = 'runway2':
 						'They put you into the clothes that they''ve decided you''re going to be modelling and you wait for the show to begin.'
 						act'Continue':
 							hour += 1
-							modelpayfin = 500 + (city_modelling * 10) + (modelpay * 3) + (50*rand(0,7))
-							city_modelling += rand(10,30)
-							pav_modelling += rand(0,city_modelling)/8
+							modelpayfin = 500 + (fame['city_modelling'] * 10) + (modelpay * 3) + (50*rand(0,7))
+							if rand(0,1) = 1:
+								gs 'fame', 'city', 'modelling', 'medium'
+							else
+								gs 'fame', 'city', 'modelling', 'small'
+							end
 							mdlng_exp += rand(8,10)
 							modelfoto_nip += 1
 							gs'stat'
@@ -2209,8 +2239,11 @@ if $ARGS[0] = 'wet':
 							modelfoto_nude += 1
 							if pcs_makeup > 1:pcs_makeup = 0
 							mdlng_exp += rand(9,10)
-							city_modelling += rand(18,21)
-							pav_modelling += rand(0,city_modelling)/4
+							if rand(0,1) = 1:
+								gs 'fame', 'city', 'modelling', 'medium'
+							else
+								gs 'fame', 'city', 'modelling', 'small'
+							end
 							money += modelpayfin
 							modelfotomoney += modelpayfin
 							'Eventually, the shoot is over and they leave you cold, shivering, and with really hard nipples. But at least you''ve also got a dry wad of cash that counts out to <<modelpayfin>> <b>₽</b>.'

locations/foto_events2.qsrc

@@ -77,7 +77,7 @@ if $ARGS[0] = 'champagne1.2':
 	pcs_hairbsh = 1
 	pcs_makeup = 5
 	pcs_lipbalm += 8
-	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
+	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
@@ -103,8 +103,7 @@ if $ARGS[0] = 'champagne1.2':
 				pcs_sweat += 25
 				money += modelpayfin
 				modelfotomoney += modelpayfin
-				city_modelling += rand(20,40)
-				pav_modelling += rand(0,city_modelling)/4
+				gs 'fame', 'city', 'modelling', 'medium'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 				'After about an hour, they''ve got all the shots they want for your special. It was a pretty short shoot since they knew what they wanted to get and everything was already set up. However, you''re very sticky from all that champagne you poured over yourself. Someone gives you an envelope containing <<modelpayfin>> <b>₽</b> and you thank them, excusing yourself to go take a shower and get all this stuff off of you.'
@@ -136,13 +135,11 @@ if $ARGS[0] = 'kickboxing_documentary':
             cla & *clr
             '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD1.jpg"></center>'
             minut += 120
-            modelpayfin = 900 + (modelpay * 2) + (50*rand(0,7)) + ((city_kickboxing + pcs_apprnc)/2)*2
+            modelpayfin = 900 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_kickboxing'] + pcs_apprnc)/2)*2
             modelfoto_naked += 1
             mdlng_exp += rand(1,2)
-            city_kickboxing += rand(2,12)
-            pav_kickboxing += rand(0,city_modelling)/12  
-            city_modelling += rand(2,12)
-            pav_modelling += rand(0,city_modelling)/12
+			gs 'fame', 'city', 'kickboxing', 'medium'
+            gs 'fame', 'city', 'modelling', 'medium'
 			gs 'exhibitionism', 1
             money += modelpayfin
             modelfotomoney += modelpayfin
@@ -155,12 +152,12 @@ if $ARGS[0] = 'kickboxing_documentary':
                 cla & *clr
                 gs 'stat'
                 '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD2.jpg"></center>'
-                if city_kickboxing >=150 and kickbox['sash'] >= 5:
+                if fame['city_kickboxing'] >=150 and kickbox['sash'] >= 5:
                     '"You are <<$pcs_lastname>> Isn''t it?"'
                     'The journalist shakes your hand with a big smile on his face. Interviewing you, must be a great thing, as practically without stopping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
                     '"Your feeling about that victory? Your favorite color? A man in your life?"'
                     'The interview goes and goes like this during a long time, until your allocated time end, and then reluctantly the journalist leaves you to talk to another kickboxer.'            
-                elseif city_kickboxing >=60 and kickbox['sash'] >= 2:
+                elseif fame['city_kickboxing'] >=60 and kickbox['sash'] >= 2:
                     'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the league, confirmation on their information. In general, it doesn''t seem too deep but it is evident that the journalist has his hands more than full, catching up with all the women in the gymnasium.'
                 else
                     'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
@@ -169,11 +166,11 @@ if $ARGS[0] = 'kickboxing_documentary':
                     cla & *clr   
                     gs 'stat'
                     '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD3.jpg"></center>'
-                    if city_kickboxing >=150 and kickbox['sash'] >= 5:						                               
+                    if fame['city_kickboxing'] >=150 and kickbox['sash'] >= 5:						                               
                         'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
                         'Sometime later, the article is sent to your phone...' 
                         'And is a little awkward... The realization, that you are getting famous, as one of the best, if not the BEST, female kickboxer in all St. Petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Mean and Famous!'                            
-                    elseif city_kickboxing >=60 and kickbox['sash'] >= 2:
+                    elseif fame['city_kickboxing'] >=60 and kickbox['sash'] >= 2:
                         'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
                         'Sometime later, the article is sent to your phone...' 
                         'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming kickboxer.'
@@ -212,13 +209,11 @@ if $ARGS[0] = 'track_&_field_documentary':
             cla & *clr
             '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD1.jpg"></center>'
             minut += 120
-            modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7)) + ((city_running + pcs_apprnc)/2)*2
+            modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_running'] + pcs_apprnc)/2)*2
             modelfoto_naked += 1
             mdlng_exp += rand(1,2)
-            city_running += rand(2,12)
-            pav_running += rand(0,city_modelling)/12 
-            city_modelling += rand(2,12)
-            pav_modelling += rand(0,city_modelling)/6
+			gs 'fame', 'city', 'running', 'small'
+            gs 'fame', 'city', 'modelling', 'small'
             money += modelpayfin
             modelfotomoney += modelpayfin
             modelfoto_topless += 1
@@ -231,12 +226,12 @@ if $ARGS[0] = 'track_&_field_documentary':
                 cla & *clr   
                 gs 'stat' 
                 '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD2.jpg"></center>'              
-                if city_running >=90 and razradbeg >= 3:
+                if fame['city_running'] >=90 and razradbeg >= 3:
                     '"You are <<$pcs_lastname>> Isn''t it?"'
                     'The journalist shakes your hand with a big smile on his face. Interviewing you must be a great thing, as practically without stoping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
                     '"Your feeling about that victory? Your favorite color? A man in your life?"'
                     'The interview goes on and on like this for a long time, until you''re allocated time ends, and then reluctantly the journalist leaves you to talk to another runner.'            
-                elseif city_running >=30 and razradbeg >= 1:
+                elseif fame['city_running'] >=30 and razradbeg >= 1:
                     'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the Championship, confirmation on their information. In general, it doesn''t seem too deep but it is evident that the journalist has his hands more than full, catching up with all the women in the field.'
                 else
                     'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
@@ -246,11 +241,11 @@ if $ARGS[0] = 'track_&_field_documentary':
                     cla & *clr   
                     gs 'stat'
                     '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD3.jpg"></center>'                      
-                    if city_running >=90 and razradbeg >= 3:					
+                    if fame['city_running'] >=90 and razradbeg >= 3:					
                         'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
                         'Sometime later, the article is sent to your phone...' 
                         'And is a little awkward... The realization, that you are getting famous, as one of the best, if not THE best runner in The Women''s 400 Meter Dash category in all of St. Petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Fast and Famous!'                            
-                    elseif city_running >=30 and razradbeg >= 1:
+                    elseif fame['city_running'] >=30 and razradbeg >= 1:
                         'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
                         'Sometime later, the article is sent to your phone...' 
                         'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming runner in The Women''s 400 Meter Dash category.'

locations/foto_model_documentary.qsrc

@@ -1141,13 +1141,12 @@ end
 if $ARGS[0] = 'documentary_end':
 	foto['documentary'] = 0
 	minut += 10
-	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 10) + min(fame['city_modelling'], 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	mdlng_exp += rand(9,10)
 	if pcs_inhib < 55: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(20,40)
-	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
+	gs 'fame', 'city', 'modelling', 'medium'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', 'small'
 	inhib_exp += rand(1,3)
 	money += modelpayfin
 	modelfotomoney += modelpayfin

locations/foto_shoot.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'model':
 	if model['status'] = 0:model['status'] = 1
 	*clr & cla
 	minut += 5
-	modelpay = (pcs_mdlng/2 * 10) + ((min(city_modelling, 700) + pcs_apprnc)/2)
+	modelpay = (pcs_mdlng/2 * 10) + ((min(fame['city_modelling'], 700) + pcs_apprnc)/2)
 	modelpayfin = 900 + (15*rand(0,5))
 	gs 'stat'
 	'<center><b><font color="maroon">Manager</font></b></center>'
@@ -51,6 +51,7 @@ if $ARGS[0] = 'model':
 			modelfoto_catalog += 1
 			model_job_week += 1
 			mdlng_exp += rand(2,5)
+			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
 			money += 450
 			modelfotomoney += 450
@@ -72,6 +73,7 @@ if $ARGS[0] = 'model':
 			modelfoto_catalog += 1
 			model_job_week += 1
 			mdlng_exp += rand(2,5)
+			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
 			money += 450
 			modelfotomoney += 450
@@ -196,8 +198,8 @@ end
 !!			modelpayfin = 700 + (modelpay) + (15*rand(0,5))
 !!			modelfoto_nip += 1
 !!			mdlng_exp += rand(6,10)
-!!			city_modelling += rand(7,13)
-!!			pav_modelling += rand(1,city_modelling)/10
+!!			fame['city_modelling'] += rand(7,13)
+!!			pav_modelling += rand(1,fame['city_modelling'])/10
 !!			inhib_exp += 2
 !!			gs 'stat'
 !!			'<center><video autoplay loop src="images/locations/city/citycenter/photo/model5.mp4"></video></center>'
@@ -545,12 +547,11 @@ end
 if $ARGS[0] = 'fashion':
 	*clr & cla
 	minut += 120
-	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_fashion += 1
 	mdlng_exp += rand(5,8)
-	gs 'fame', 'city', 'modelling', rand(7,12)
-	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
+	gs 'fame', 'city', 'modelling', 'small'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
 	fashionshoot = rand(1,2)
 	gs 'stat'
 	if fashionshoot = 1:
@@ -571,12 +572,11 @@ end
 if $ARGS[0] = 'bikini':
 	*clr & cla
 	minut += 120
-	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_bikini += 1
 	if pcs_inhib < 20: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(7,12)
-	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
+	gs 'fame', 'city', 'modelling', 'small'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 50:inhib_exp += rand(0,1)
 	gs 'stat'
@@ -595,13 +595,12 @@ end
 if $ARGS[0] = 'lingerie':
 	*clr & cla
 	minut += 120
-	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_lingerie += 1
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 25: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(7,13)
-	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
+	gs 'fame', 'city', 'modelling', 'small'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,6)
 	inhib_exp += rand(0,2)
 	shoot = rand(1,2)
 	gs 'stat'
@@ -622,14 +621,13 @@ end
 if $ARGS[0] = 'sexy':
 	*clr & cla
 	minut += 120
-	modelpayfin = 500 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
+	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
 	mdlng_exp += rand(5,10)
 	if pcs_inhib < 30: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(7,12)
-	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(1,6)
+	gs 'fame', 'city', 'modelling', 'small'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(1,6)
 	inhib_exp += rand(0,1)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,48)>>.jpg"></center>'
@@ -652,9 +650,8 @@ if $ARGS[0] = 'transparent':
 	modelfoto_nip += 1
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 45: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(7,13)
-	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
+	gs 'fame', 'city', 'modelling', 'small'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,8)
 	inhib_exp += rand(0,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru/<<rand(1,26)>>.jpg"></center>'
@@ -678,9 +675,8 @@ if $ARGS[0] = 'trans_ling':
 	modelfoto_lingerie += 1
 	mdlng_exp += rand(8,10)
 	if pcs_inhib < 45: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(9,14)
-	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
+	gs 'fame', 'city', 'modelling', 'small'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,8)
 	inhib_exp += rand(0,2)
 	gs 'stat'
 	if rand(0,1) = 1:
@@ -708,9 +704,8 @@ if $ARGS[0] = 'topless':
 	modelfoto_topless += 1
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 50: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(8,14)
-	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
+	gs 'fame', 'city', 'modelling', 'small'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,8)
 	inhib_exp += rand(0,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless/<<rand(1,57)>>.jpg"></center>'
@@ -727,15 +722,14 @@ end
 if $ARGS[0] = 'tasteful':
 	*clr & cla
 	minut += 120
-	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
+	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
 	mdlng_exp += rand(9,10)
 	if pcs_inhib < 40: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(10,20)
-	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
+	gs 'fame', 'city', 'modelling', 'small'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
 	inhib_exp += rand(0,2)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/tastenude/<<rand(1,28)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
@@ -751,15 +745,14 @@ end
 if $ARGS[0] = 'topless_nude':
 	*clr & cla
 	minut += 120
-	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
+	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
 	mdlng_exp += rand(9,10)
 	if pcs_inhib < 55: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(10,20)
-	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
+	gs 'fame', 'city', 'modelling', 'medium'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
 	inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topnude/<<rand(1,79)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
@@ -775,7 +768,7 @@ end
 if $ARGS[0] = 'nude':
 	*clr & cla
 	minut += 120
-	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
+	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
@@ -784,9 +777,8 @@ if $ARGS[0] = 'nude':
 	modelfoto_pussy += 1
 	mdlng_exp += rand(9,10)
 	if pcs_inhib < 60: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(10,20)
-	gs 'fame', 'pav', 'modelling', rand(10,15)
-	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(5,10)
+	gs 'fame', 'city', 'modelling', 'medium'
+	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(5,10)
 	inhib_exp += rand(1,3)
 	if pcs_pubes < 16:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude/<<rand(1,17)>>.jpg"></center>'
@@ -824,9 +816,8 @@ if $ARGS[0] = 'erotic':
 	modelfoto_asshole += 1
 	mdlng_exp += rand(1,4)
 	if pcs_inhib < 65: gs 'willpower','pay','self'
-	gs 'fame', 'city', 'modelling', rand(5,10)
-	gs 'fame', 'city', 'porn', rand(5,15)
-	gs 'fame', 'pav', 'porn', rand(0,15)
+	gs 'fame', 'city', 'modelling', 'small'
+	gs 'fame', 'city', 'porn', 'small'
 	if pcs_inhib < 60:inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/erotic/<<rand(1,19)>>.jpg"></center>'
 	if $pantyworntype ! 'none':
@@ -847,11 +838,11 @@ end
 if $ARGS[0] = 'sportswear':
 	*clr & cla
 	minut += 120
-	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
+	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (fame['city_modelling']/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
 	modelfoto_fitness += 1
 	pcs_sweat = 60
 	mdlng_exp += rand(2,4)
-	gs 'fame', 'city', 'modelling', rand(3,6)
+	gs 'fame', 'city', 'modelling', 'small'
 	gs 'stat'
 	if bodset = 2 and salocatnow >= 2:
 		*clr & cla
@@ -875,10 +866,10 @@ end
 if $ARGS[0] = 'sports_underwear':
 	*clr & cla
 	minut += 120
-	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
+	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (fame['city_modelling']/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
 	modelfoto_fitness += 1
 	pcs_sweat = 60
-	gs 'fame', 'city', 'modelling', rand(3,6)
+	gs 'fame', 'city', 'modelling', 'small'
 	mdlng_exp += rand(3,6)
 	if pcs_inhib < 50:inhib_exp += 1
 	gs 'stat'
@@ -900,13 +891,13 @@ end
 if $ARGS[0] = 'fitness_artistic_nude':
 	*clr & cla
 	minut += 120
-	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc + city_sport
+	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
 	pcs_sweat = 60
 	mdlng_exp += rand(4,5)
-	gs 'fame', 'city', 'modelling', rand(5,10)
+	gs 'fame', 'city', 'modelling', 'small'
 	inhib_exp += 2
 	gs 'stat'	
 	if bodset = 2 and salocatnow >= 2:
@@ -937,8 +928,8 @@ end
 !!				minut += 120
 !!				modelpayfin = 825 + (modelpay * 2) + (15*rand(0,7))
 !!				mdlng_exp += 10
-!!				city_modelling += rand(10,20)
-!!				pav_modelling += rand(0,city_modelling)/10
+!!				fame['city_modelling'] += rand(10,20)
+!!				pav_modelling += rand(0,fame['city_modelling'])/10
 !!				inhib_exp += 3
 !!				modelfoto_glamour += 1
 !!				modelfoto_nip += 1