Merge remote-tracking branch 'julzor/master'

locations/foto.qsrc

@@ -145,23 +145,34 @@ if $ARGS[0] = 'studio':
 	*clr & cla
 	killvar '$modelopt'
 
-	if special_model < city_modelling and modelfoto_nip > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
+	if special_model < min(city_modelling, 700) and modelfoto_nip > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
 	if special_skill_model < pcs_mdlng and modelfoto_nip > 0 and hour < 15 and skill_model_event < daystart:gt 'foto_events','skill'
 
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
 
-	if city_modelling >= 200 and city_modelling < 240:rank = 1
-	if city_modelling >= 240 and city_modelling < 280:rank = 2
-	if city_modelling >= 280 and city_modelling < 320:rank = 3
-	if city_modelling >= 320 and city_modelling < 360:rank = 4
-	if city_modelling >= 360 and city_modelling < 400:rank = 5
-	if city_modelling >= 400 and city_modelling < 440:rank = 6
-	if city_modelling >= 440 and city_modelling < 560:rank = 7
-	if city_modelling >= 560 and city_modelling < 620:rank = 8
-	if city_modelling >= 620 and city_modelling < 700:rank = 9
-	if city_modelling >= 700:rank = 10
+	if city_modelling >= 200 and city_modelling < 240:
+		rank = 1
+	elseif city_modelling >= 240 and city_modelling < 280:
+		rank = 2
+	elseif city_modelling >= 280 and city_modelling < 320:
+		rank = 3
+	elseif city_modelling >= 320 and city_modelling < 360:
+		rank = 4
+	elseif city_modelling >= 360 and city_modelling < 400:
+		rank = 5
+	elseif city_modelling >= 400 and city_modelling < 440:
+		rank = 6
+	elseif city_modelling >= 440 and city_modelling < 560:
+		rank = 7
+	elseif city_modelling >= 560 and city_modelling < 620:
+		rank = 8
+	elseif city_modelling >= 620 and city_modelling < 700:
+		rank = 9
+	elseif city_modelling >= 700:
+		rank = 10
+	end
 
 	anastasia_in = rand(0,1)
 	mari_in = rand(0,1)

locations/foto_albums.qsrc

@@ -4,18 +4,27 @@ menu_off = 1
 
 if $ARGS[0] = 'model_portraits':
 	
-	if rank = 1:gt 'foto_albums','sveta_10'
-	if rank = 2:gt 'foto_albums','sveta_9'
-	if rank = 3:gt 'foto_albums','sveta_8'
-	if rank = 4:gt 'foto_albums','sveta_7'
-	if rank = 5:gt 'foto_albums','sveta_6'
-	if rank = 6:gt 'foto_albums','sveta_5'
-	if rank = 7:gt 'foto_albums','sveta_4'
-	if rank = 8:gt 'foto_albums','sveta_2'
-	if rank = 9:gt 'foto_albums','sveta_3'
-	if rank = 10:gt 'foto_albums','sveta_1'
-	
-	
+	if rank = 1:
+		gt 'foto_albums','sveta_10'
+	elseif rank = 2:
+		gt 'foto_albums','sveta_9'
+	elseif rank = 3:
+		gt 'foto_albums','sveta_8'
+	elseif rank = 4:
+		gt 'foto_albums','sveta_7'
+	elseif rank = 5:
+		gt 'foto_albums','sveta_6'
+	elseif rank = 6:
+		gt 'foto_albums','sveta_5'
+	elseif rank = 7:
+		gt 'foto_albums','sveta_4'
+	elseif rank = 8:
+		gt 'foto_albums','sveta_2'
+	elseif rank = 9:
+		gt 'foto_albums','sveta_3'
+	elseif rank = 10:
+		gt 'foto_albums','sveta_1'
+	end	
 
 	*clr & cla
 	act'Move away':gt'foto','studio'

locations/foto_events.qsrc

@@ -827,7 +827,7 @@ end
 !!------------------------------------------------------------------- Special Modelling Jobs ------------------------------------------------------------------
 
 if $ARGS[0] = 'special':
-	modelpay = (pcs_mdlng/2 * 25) + (func('shortgs','sqrt', city_modelling) * 50) + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 25) + (func('shortgs','sqrt', min(city_modelling, 700)) * 50) + pcs_apprnc
 	if specialmodelrequest ! daystart:
 		specialmodelrequest = daystart
 		specialjob1 = rand(1,100)
@@ -1486,12 +1486,19 @@ 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:'"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."'
-			if city_modelling >= 100 and 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.""'
-			if 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."'
+			if 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:
+				'"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:
+				'"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:'"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?"'
-			if 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?"'
+			if 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:
+				'"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:
 				gs 'willpower', 'exhib', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
@@ -1583,10 +1590,13 @@ 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:'"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."'
-			if city_modelling < 100:'"What would I be doing? What sport?"'
-			if city_modelling < 100:'"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."'
-			if 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?"'
+			if 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:
+				'"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:
 				gs 'willpower', 'exhib', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:

locations/foto_shoot.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'model':
 	if model = 0:model = 1
 	*clr & cla
 	minut += 5
-	modelpay = (pcs_mdlng/2 * 10) + ((city_modelling + pcs_apprnc)/2)
+	modelpay = (pcs_mdlng/2 * 10) + ((min(city_modelling, 700) + pcs_apprnc)/2)
 	modelpayfin = 900 + (15*rand(0,5))
 	gs 'stat'
 	'<center><b><font color="maroon">Manager</font></b></center>'
@@ -463,14 +463,12 @@ end
 if $ARGS[0] = 'fashion':
 	*clr & cla
 	minut += 120
-	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(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)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
 	fashionshoot = rand(1,2)
 	gs 'stat'
 	if fashionshoot = 1:
@@ -491,13 +489,11 @@ end
 if $ARGS[0] = 'bikini':
 	*clr & cla
 	minut += 120
-	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_bikini += 1
 	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)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
 	minut += 120
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 50:inhib_exp += rand(0,1)
@@ -517,14 +513,12 @@ end
 if $ARGS[0] = 'lingerie':
 	*clr & cla
 	minut += 120
-	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_lingerie += 1
 	mdlng_exp += rand(6,10)
 	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)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
 	inhib_exp += rand(0,2)
 	shoot = rand(1,2)
 	gs 'stat'
@@ -545,15 +539,13 @@ end
 if $ARGS[0] = 'sexy':
 	*clr & cla
 	minut += 120
-	modelpayfin = 500 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 500 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_glamour += 1
 	modelfoto_ero_clo += 1
 	mdlng_exp += rand(5,10)
 	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)
-	end
+	if 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,20)>>.jpg"></center>'
@@ -573,9 +565,7 @@ if $ARGS[0] = 'transparent':
 	mdlng_exp += rand(6,10)
 	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)
-	end
+	if 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,10)>>.jpg"></center>'
@@ -600,9 +590,7 @@ if $ARGS[0] = 'trans_ling':
 	mdlng_exp += rand(8,10)
 	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)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
 	inhib_exp += rand(0,2)
 	gs 'stat'
 	if rand(0,1) = 1:
@@ -632,9 +620,7 @@ if $ARGS[0] = 'topless':
 	mdlng_exp += rand(6,10)
 	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)
-	end
+	if 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,27)>>.jpg"></center>'
@@ -651,15 +637,13 @@ end
 if $ARGS[0] = 'tasteful':
 	*clr & cla
 	minut += 120
-	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto_tastenude += 1
 	mdlng_exp += rand(9,10)
 	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)
-	end
+	if 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,14)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
@@ -674,7 +658,7 @@ end
 
 if $ARGS[0] = 'topless_nude':
 	*clr & cla
-	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	minut += 120
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto_nude += 1
@@ -682,9 +666,7 @@ if $ARGS[0] = 'topless_nude':
 	mdlng_exp += rand(9,10)
 	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)
-	end
+	if 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,40)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
@@ -702,7 +684,7 @@ end
 if $ARGS[0] = 'nude':
 	*clr & cla
 	minut += 120
-	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	if modelfoto_nude = 0: modelpayfin * 2 & foto_persuade = 0
 	modelfoto_nude += 1
@@ -712,9 +694,7 @@ if $ARGS[0] = 'nude':
 	mdlng_exp += rand(9,10)
 	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)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(5,10)
 	inhib_exp += rand(1,3)
 	if pcs_pubes <= 20:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude/<<rand(1,17)>>.jpg"></center>'