Merge remote-tracking branch 'hornguy6/master'

locations/foto_shoot.qsrc

@@ -91,9 +91,9 @@ if $ARGS[0] = 'model':
 					act 'Look at other options':gt'foto_shoot','model'
 					
 					if pcs_mdlng > 20:
-						gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+						gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 					else
-						gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+						gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 					end
 					if will_cost <= pcs_willpwr:
 						*nl
@@ -119,9 +119,9 @@ if $ARGS[0] = 'model':
 					act 'Look at other options':gt'foto_shoot','model'
 					
 					if pcs_mdlng > 20:
-						gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+						gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 					else
-						gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+						gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 					end
 					if will_cost <= pcs_willpwr:
 						*nl
@@ -209,9 +209,9 @@ if $ARGS[0] = 'glamour_shoot':
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 20:
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
 				*nl
@@ -241,9 +241,9 @@ if $ARGS[0] = 'glamour_shoot':
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 40:
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
 				*nl
@@ -273,9 +273,9 @@ if $ARGS[0] = 'glamour_shoot':
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 40:
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
 				*nl
@@ -305,9 +305,9 @@ if $ARGS[0] = 'glamour_shoot':
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 45:
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
 				*nl
@@ -344,9 +344,9 @@ if $ARGS[0] = 'nude_shoot':
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 35:
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
 				*nl
@@ -376,9 +376,9 @@ if $ARGS[0] = 'nude_shoot':
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 50:
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
 				*nl
@@ -409,9 +409,9 @@ if $ARGS[0] = 'nude_shoot':
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 55:
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
 				*nl
@@ -442,9 +442,9 @@ if $ARGS[0] = 'nude_shoot':
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 60:
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
-				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
 				*nl