Browse Source

[fixed] correct formatting

hornguy6 3 years ago
parent
commit
3565d7d572
2 changed files with 18 additions and 21 deletions
  1. 4 4
      locations/foto_events.qsrc
  2. 14 17
      locations/foto_shoot.qsrc

+ 4 - 4
locations/foto_events.qsrc

@@ -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 $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 $shoot_type = 'topless':
 				act'Do the topless shoot':gt'foto_shoot','topless'
-			elseif shoot_type = taste_nude:
+			elseif $shoot_type = 'taste_nude':
 				act'Do the tasteful nude shoot':gt'foto_shoot','tasteful'
-			elseif shoot_type = top_nude:
+			elseif $shoot_type = 'top_nude':
 				act'Do the topless nude shoot':gt'foto_shoot','topless_nude'
 			end
 		end

+ 14 - 17
locations/foto_shoot.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'model':
 		'"Alright, what kind of shoot? Clothing or swimsuits?"'
 		
 		act'Clothing':
-			shoot_type = catalog
+			$shoot_type = 'catalog'
 			modelfoto += 1
 			modelfoto_catalog += 1
 			model_job_week += 1
@@ -67,7 +67,7 @@ if $ARGS[0] = 'model':
 			act 'Leave':gt 'foto', 'studio'
 		end
 		act'Swimsuits':
-			shoot_type = swim_catalog
+			$shoot_type = 'swim_catalog'
 			modelfoto += 1
 			modelfoto_catalog += 1
 			model_job_week += 1
@@ -93,7 +93,7 @@ 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
+				$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'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'model':
 			end
 
 			act 'Bikini':
-				shoot_type = bikini
+				$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 pcs_inhib < 20:
@@ -129,7 +129,7 @@ if $ARGS[0] = 'model':
 
 
 			act 'Lingerie modelling':
-				shoot_type = lingerie
+				$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 pcs_inhib < 25:
@@ -227,7 +227,7 @@ if $ARGS[0] = 'glamour_shoot':
 	'"Alright, we can do that. What kind of glamour shoot?"'
 	act 'Sexy clothing':
 		*clr & cla
-		shoot_type = sexy_clo
+		$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'
 		if pcs_inhib < 30:
 			if modelfoto_ero_clo > 0:
@@ -258,7 +258,7 @@ if $ARGS[0] = 'glamour_shoot':
 
 	act 'Transparent clothing':
 		*clr & cla
-		shoot_type = trans_clo
+		$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:
@@ -289,9 +289,9 @@ if $ARGS[0] = 'glamour_shoot':
 	end
 	
 	act 'Transparent Lingerie':
-		shoot_type = trans_ling
+		$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: $shoot_type = 'trans_ling' & gt'foto_events','topless_persuasion'
 		if pcs_inhib < 45:
 			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?'
@@ -321,7 +321,7 @@ if $ARGS[0] = 'glamour_shoot':
 	end
 
 	act 'Topless':
-		shoot_type = topless
+		$shoot_type = 'topless'
 		*clr & cla
 		if modelfoto_topless >= 5 and modelfoto_nude < 1: gt'foto_events','nude_persuasion'
 		if pcs_inhib < 50:
@@ -366,7 +366,7 @@ if $ARGS[0] = 'nude_shoot':
 	'"Alright, we can do that. What kind of nude shoot?"'
 	
 	act 'Tasteful nude':
-		shoot_type = taste_nude
+		$shoot_type = 'taste_nude'
 		*clr & cla
 		if modelfoto_tastenude >= 5 and modelfoto_topless + modelfoto_toplessnude + modelfoto_fullnude < 1: gt'foto_events','nude_persuasion'
 		if pcs_inhib < 40:
@@ -398,7 +398,7 @@ if $ARGS[0] = 'nude_shoot':
 	end
 	
 	act 'Topless nude':
-		shoot_type = top_nude
+		$shoot_type = 'top_nude'
 		*clr & cla
 		if modelfoto_toplessnude >= 3 and modelfoto_pussy < 1:gt'foto_events','nude_persuasion'
 		if pcs_inhib < 55:
@@ -430,7 +430,7 @@ if $ARGS[0] = 'nude_shoot':
 	end
 	
 	act 'Full nude':
-		shoot_type = full_nude
+		$shoot_type = 'full_nude'
 		*clr & cla
 		if pcs_inhib < 60:
 			if modelfoto_fullnude > 0:
@@ -463,7 +463,7 @@ if $ARGS[0] = 'nude_shoot':
 	end
 	
 	act 'Erotic':
-		shoot_type = erotic
+		$shoot_type = 'erotic'
 		*clr & cla
 		if pcs_inhib < 65:
 			if modelfoto_pussy < 1:
@@ -804,7 +804,6 @@ if $ARGS[0] = 'nude':
 	elseif modelfoto_nude = 1 and foto_persuade = 5:
 		'It even includes the bonus the manager said they''d give you for your debut!'
 	end
-	if pornstudio = 0:pornstudio = 2 & *nl & 'At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
 
 	if pcs_mdlng >= 40 and commercial = 0:
 		act 'Leave':gt'foto_events','commercial'
@@ -837,8 +836,6 @@ if $ARGS[0] = 'erotic':
 	end
 	*nl
 	'You spend two hours posing while the photographer takes many photos of your nude body, but especially your breasts, pussy, and asshole. You can see the rock-hard outline of his cock the whole time and you are paid <<modelpayfin>> <b>₽</b> for your work.'
-	
-	if pornstudio = 0:pornstudio = 2 & 'At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You read it and see that it''s for a porn production company in St. Petersburg. "You''re basically already shooting softcore nudes, so we thought we''d offer you the chance to go hardcore."'
 
 	if pcs_mdlng >= 40 and commercial = 0:
 		act 'Leave':gt'foto_events','commercial'