Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/Voltrener.qsrc

@@ -204,7 +204,7 @@ if $ARGS[0] = 'talk':
 				else
 					'You ask the coach about joining the team, the coach thinks for a minute. "I have a spot for a substitute, but I do not know if you have what it takes."'
 					gs 'willpower', 'misc', 'self'
-					if will_cost <= pcs_willpwer:
+					if will_cost <= pcs_willpwr:
 						act 'Persuade him (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'pay', 'self'

locations/abduction.qsrc

@@ -1,6 +1,6 @@
 # abduction
 
-$location_type = private
+$location_type = 'private'
 $metka = 'start'
 $loc = 'abduction'
 
@@ -590,7 +590,7 @@ if $ARGS[0] = 'abdFood':
 	act 'Eat dried food (0:10)':
 		*clr & cla
 		menu_off = 1
-		minut += 15
+		minut += 10
 		frost = 0
 		pcs_health += 10
 		pcs_mood += 10

locations/obj_din.qsrc

@@ -1897,8 +1897,15 @@ if $ARGS[0] = 'body':
 !!	This displays the body image; $bodimgsets[x9] is the folder name
 	!some in-game script may call this to display image, so leave it be
 	$img_temp = FUNC('$body_image','body')
+	if $modApi_body_image ! '':
+		$img_temp = $modApi_body_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_body_image_msg = '':
+		'<<$body_image_msg>>'
+	else 
+		'<<$modApi_body_image_msg>>'
+	end
 	killvar 'img_temp'
 	killvar 'body_image_msg'
 	'</td></tr></table></center>'
@@ -1913,13 +1920,27 @@ if $ARGS[0] = 'clothes':
 	!move image define to $body_image
 	!display cloth
 	$img_temp = FUNC('$body_image','clothes')
+	if $modApi_clothes_image ! '':
+		$img_temp = $modApi_clothes_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_clothes_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_clothes_image_msg>>`
+	end
 	'</td><td width="50%" cellpadding="20" valign="top">'
 	!display coat
 	$img_temp = FUNC('$body_image','coat')
+	if $modApi_coat_image ! '':
+		$img_temp = $modApi_coat_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_coat_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_coat_image_msg>>`
+	end
 	'</td></tr>'
 	'</table></center>'
 
@@ -1935,8 +1956,16 @@ if $ARGS[0] = 'panties':
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	$img_temp = FUNC('$body_image','panties')
+	if $modApi_panties_image ! '':
+		$img_temp = $modApi_panties_image
+	end
+	
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_panties_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_panties_image_msg>>`
+	end
 	killvar 'img_temp'
 	killvar 'body_image_msg'
 	'</td></tr></table></center>'
@@ -1949,8 +1978,15 @@ if $ARGS[0] = 'bra':
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	$img_temp = FUNC('$body_image','bra')
+	if $modApi_bra_image ! '':
+		$img_temp = $modApi_bra_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_bra_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_bra_image_msg>>`
+	end
 	killvar 'img_temp'
 	killvar 'body_image_msg'
 	'</td></tr></table></center>'
@@ -1973,8 +2009,15 @@ if $ARGS[0] = 'shoes':
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	$img_temp = FUNC('$body_image','shoes')
+	if $modApi_shoes_image ! '':
+		$img_temp = $modApi_shoes_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_shoes_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_shoes_image_msg>>`
+	end
 	killvar 'img_temp'
 	killvar 'body_image_msg'
 	'</td></tr></table></center>'