1
0
Эх сурвалжийг харах

Merge remote-tracking branch 'hornguy6/master'

# Conflicts:
#	locations/foto_shoot.qsrc
KevinSmarts 4 жил өмнө
parent
commit
34791212ce

+ 9 - 11
locations/foto_shoot.qsrc

@@ -109,7 +109,6 @@ if $ARGS[0] = 'model':
 				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'
-					act 'Look at other options':gt'foto_shoot','model'
 					
 					if pcs_mdlng > 20:
 						gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -137,7 +136,6 @@ if $ARGS[0] = 'model':
 				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'
-					act 'Look at other options':gt'foto_shoot','model'
 					
 					if pcs_mdlng > 20:
 						gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -239,7 +237,7 @@ if $ARGS[0] = 'glamour_shoot':
 				'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.'			
 			end
 			act 'Look at something else':gt 'foto_shoot','model'
-			act 'Look at other options':gt'foto_shoot','model'
+			act 'Look at other glamour options':gt'foto_shoot','glamour_shoot'
 			
 			if pcs_inhib > 20:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -271,7 +269,7 @@ if $ARGS[0] = 'glamour_shoot':
 			end
 			
 			act 'Look at something else':gt 'foto_shoot','model'
-			act 'Look at other options':gt'foto_shoot','model'
+			act 'Look at other glamour options':gt'foto_shoot','glamour_shoot'
 			
 			if pcs_inhib > 40:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -303,7 +301,7 @@ if $ARGS[0] = 'glamour_shoot':
 			end
 			
 			act 'Look at something else':gt 'foto_shoot','model'
-			act 'Look at other options':gt'foto_shoot','model'
+			act 'Look at other glamour options':gt'foto_shoot','glamour_shoot'
 			
 			if pcs_inhib > 40:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -335,7 +333,7 @@ if $ARGS[0] = 'glamour_shoot':
 			end
 			
 			act 'Look at something else':gt 'foto_shoot','model'
-			act 'Look at other options':gt'foto_shoot','model'
+			act 'Look at other glamour options':gt'foto_shoot','glamour_shoot'
 			
 			if pcs_inhib > 45:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -380,7 +378,7 @@ if $ARGS[0] = 'nude_shoot':
 			end		
 			
 			act 'Look at something else':gt 'foto_shoot','model'
-			act 'Look at other options':gt'foto_shoot','model'
+			act 'Look at other nude options':gt'foto_shoot','nude_shoot'
 			
 			if pcs_inhib > 35:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -412,7 +410,7 @@ if $ARGS[0] = 'nude_shoot':
 			end
 			
 			act 'Look at something else':gt 'foto_shoot','model'
-			act 'Look at other options':gt'foto_shoot','model'
+			act 'Look at other nude options':gt'foto_shoot','nude_shoot'
 			
 			if pcs_inhib > 50:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -445,7 +443,7 @@ if $ARGS[0] = 'nude_shoot':
 			end
 		
 			act 'Look at something else':gt 'foto_shoot','model'
-			act 'Look at other options':gt'foto_shoot','model'
+			act 'Look at other nude options':gt'foto_shoot','nude_shoot'
 			
 			if pcs_inhib > 55:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -478,7 +476,7 @@ if $ARGS[0] = 'nude_shoot':
 			end
 			
 			act 'Look at something else':gt 'foto_shoot','model'
-			act 'Look at other options':gt'foto_shoot','model'
+			act 'Look at other nude options':gt'foto_shoot','nude_shoot'
 			
 			if pcs_inhib > 60:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
@@ -749,8 +747,8 @@ end
 
 if $ARGS[0] = 'topless_nude':
 	*clr & cla
-	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	minut += 120
+	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto_nude += 1
 	modelfoto_toplessnude += 1