Merge branch 'master' of jeep91/glife into master

[fixed] Wrong variables for foto events
[added] Display option for bodysuit in additional stat window

locations/foto_albums.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'sveta':
 	'You open up the first album and browse through some of the pictures placed inside.'
 	'"These are pictures of me!'
 	act 'Go back': gt 'foto_albums', 'model_portraits'
-	act 'Presenting: <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>':
+	act 'Presenting: <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/1.jpg"></center>'
 		act 'Waiting For You':
@@ -418,7 +418,7 @@ if $ARGS[0] = 'sveta_10':
 	'<a href="exec:gt ''foto_albums'',''mila''">7. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">8. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">9. Anushka K.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">10. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">10. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	act'Move away':gt'foto','studio'
 end	
 	
@@ -434,7 +434,7 @@ if $ARGS[0] = 'sveta_9':
 	'<a href="exec:gt ''foto_albums'',''lily''">6. Lily I.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">7. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">8. Mari E.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">9. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">9. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
 	
 	act'Move away':gt'foto','studio'
@@ -452,7 +452,7 @@ if $ARGS[0] = 'sveta_8':
 	'<a href="exec:gt ''foto_albums'',''miranda''">5. Miranda K.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">6. Lily I.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">7. Mila A.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">8. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">8. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
 	act'Move away':gt'foto','studio'
@@ -468,7 +468,7 @@ if $ARGS[0] = 'sveta_7':
 	'<a href="exec:gt ''foto_albums'',''jeff''">4. Jeff M.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">5. Miranda K.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">6. Lily I.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">7. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">7. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
@@ -484,7 +484,7 @@ if $ARGS[0] = 'sveta_6':
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">4. Jeff M.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">5. Miranda K.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">6. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">6. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">7. Lily I.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
@@ -500,7 +500,7 @@ if $ARGS[0] = 'sveta_5':
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">4. Jeff M.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">5. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">5. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">6. Miranda K.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">7. Lily I.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
@@ -516,7 +516,7 @@ if $ARGS[0] = 'sveta_4':
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">4. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">4. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">5. Jeff M.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">6. Miranda K.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">7. Lily I.</a>'
@@ -532,7 +532,7 @@ if $ARGS[0] = 'sveta_3':
 	'Here is the shelf that has the albums of the top 10 models. As you read from left to right, you see that your name is now third. You finally took Emily''s spot! She isn''t very happy about it, but who cares? You''ve broken the barrier into being famous!'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">3. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">3. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">4. Emily R.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">5. Jeff M.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">6. Miranda K.</a>'
@@ -549,7 +549,7 @@ if $ARGS[0] = 'sveta_2':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
 	'Here is the shelf that has the albums of the top 10 models. You look and you see your name is second, right before Anastasia''s. Are you really this close? Could you take the number one spot all for yourself?'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">2. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">2. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">3. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">4. Emily R.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">5. Jeff M.</a>'
@@ -568,7 +568,7 @@ if $ARGS[0] = 'sveta_1':
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
 	'Here is the shelf that has the albums of the top 10 models. You finally did it! Listed at the very front of all of the albums is your name. Women wish they were you, men want to fuck you, and you''re likely to start getting offers in other parts of the entertainment industry. You''re the top model!'
-	'<a href="exec:gt ''foto_albums'',''sveta''">1. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">1. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">2. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">3. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">4. Emily R.</a>'

locations/foto_events.qsrc

@@ -1010,8 +1010,8 @@ if $ARGS[0] = 'list':
 	if specialjob4 > 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''">	Aphrodite Advert</a>'
 	if specialjob5 > 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
 	if specialjob6 > 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
-	if specialjob7 > 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events2'',''kickboxing_documentary''">   Kickboxing documentary</a>'
-    if specialjob8 > 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events2'',''track_&_field_documentary''">   Track & Field documentary</a>'
+	if specialjob7 > 95 and fame['city_kickboxing'] >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events2'',''kickboxing_documentary''">   Kickboxing documentary</a>'
+    if specialjob8 > 95 and fame['city_running'] >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events2'',''track_&_field_documentary''">   Track & Field documentary</a>'
 !!		if specialjob9 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
 !!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''">	Documentary</a>'
 end

locations/foto_shoot.qsrc

@@ -653,7 +653,7 @@ if $ARGS[0] = 'transparent':
 	minut += 120
 	modelpayfin = 600 + (modelpay) + (pcs_apprnc) + (15*rand(0,5))
 	modelfoto['glamour'] += 1
-	modelfoto['sexy'] 
+	modelfoto['sexy'] +=1
 	modelfoto['transparent'] += 1
 	modelfoto['nip'] += 1
 	gs 'exp_gain', 'mdlng', rand(6,10)

locations/stat_display.qsrc

@@ -61,6 +61,14 @@ if Enable_showstatimg = 1:
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
 	end
 
+	if Enable_statimg_bodysuit = 0:
+		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_bodysuit = 1 & gs ''$menu_obnovit''">◇Bodysuit</a>'
+	else
+		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_bodysuit = 0 & gs ''$menu_obnovit''">◆Bodysuit</a>'
+		$img_temp = FUNC('$body_image','bodysuit')
+		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
+	end
+	
 	if Enable_statimg_shoes = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_shoes = 1 & gs ''$menu_obnovit''">◇Shoes</a>'
 	else