Browse Source

Merge remote-tracking branch 'Hornguy6/master'

Kevin_Smarts 7 months ago
parent
commit
283167d90d
1 changed files with 8 additions and 13 deletions
  1. 8 13
      locations/foto_shoot.qsrc

+ 8 - 13
locations/foto_shoot.qsrc

@@ -47,15 +47,12 @@ if $ARGS[0] = 'model':
 		
 		
 		act'Clothing':
 		act'Clothing':
 			$modelfoto['shoot_type'] = 'catalog'
 			$modelfoto['shoot_type'] = 'catalog'
-			modelfoto['shoots'] += 1
 			modelfoto['catalog'] += 1
 			modelfoto['catalog'] += 1
-			model_job_week += 1
 			gs 'exp_gain', 'mdlng', rand(2,5)
 			gs 'exp_gain', 'mdlng', rand(2,5)
 			model_week = (daystart - week) / 7
 			model_week = (daystart - week) / 7
 			gs 'fame', 'city', 'modelling', 'tiny'
 			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
 			minut += 120
-			money += 450
-			modelfoto['earnings'] += 450
+			modelpayfin = 450
 			cla & *clr
 			cla & *clr
 			if rand(1,2) = 1:
 			if rand(1,2) = 1:
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/catalog/1.mp4"></video></center>'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/catalog/1.mp4"></video></center>'
@@ -65,27 +62,25 @@ if $ARGS[0] = 'model':
 				'You spend two hours modelling various dresses for the online catalogs of retail clothing stores. You change clothes probably 30 times over the shoot, but always wear the same expression. It''s boring but it still gets you paid.'
 				'You spend two hours modelling various dresses for the online catalogs of retail clothing stores. You change clothes probably 30 times over the shoot, but always wear the same expression. It''s boring but it still gets you paid.'
 			end
 			end
 			*nl
 			*nl
-			'You recieve 450 <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'studio'
+			'You receive 450 <b>₽</b> for the job.'
+			act 'Finish':gt 'foto', 'end'
 		end
 		end
 		act'Swimsuits':
 		act'Swimsuits':
+			!!bikinicatalog += 1
 			$modelfoto['shoot_type'] = 'swim_catalog'
 			$modelfoto['shoot_type'] = 'swim_catalog'
-			modelfoto['shoots'] += 1
 			modelfoto['catalog'] += 1
 			modelfoto['catalog'] += 1
-			model_job_week += 1
 			gs 'exp_gain', 'mdlng', rand(2,5)
 			gs 'exp_gain', 'mdlng', rand(2,5)
 			model_week = (daystart - week) / 7
 			model_week = (daystart - week) / 7
 			gs 'fame', 'city', 'modelling', 'tiny'
 			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
 			minut += 120
-			money += 450
-			modelfoto['earnings'] += 450
+			modelpayfin = 450
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,3)>>.mp4"></video></center>'
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,3)>>.mp4"></video></center>'
-			bikinicatalog += 1
+			
 			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
 			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
 			*nl
 			*nl
-			'You recieve 450 <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'studio'
+			'You receive 450 <b>₽</b> for the job.'
+			act 'Finish':gt 'foto', 'end'
 		end
 		end
 	end
 	end