61
45

4 Коммиты 9f6fa0e780 ... 53ed9ce112

Автор SHA1 Сообщение Дата
  3xpurt 53ed9ce112 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 лет назад
  3xpurt f6601059f5 [fixed] tidied up table for renown. 5 лет назад
  3xpurt a8bd7f8a39 [added] akossi's new menus to various cafes. 5 лет назад
  3xpurt 0ae67356da [changed] git ignore for new qsp player logs when running from repo folder. 5 лет назад
3 измененных файлов с 82 добавлено и 79 удалено
  1. 6 1
      .gitignore
  2. 8 4
      locations/food_menu.qsrc
  3. 68 74
      locations/obj_din.qsrc

+ 6 - 1
.gitignore

@@ -10,4 +10,9 @@ qspgui.cfg
 avatar.*
 *.jpg
 *.jpeg
-*.sublime-*
+*.sublime-*
+VideoDecodeStats/MANIFEST-000001
+VideoDecodeStats/CURRENT
+VideoDecodeStats/LOCK
+VideoDecodeStats/LOG
+VideoDecodeStats/LOG.old

+ 8 - 4
locations/food_menu.qsrc

@@ -58,7 +58,8 @@ end
 if $loc = 'gkafe':
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/menus/borislav.png"</center><br>'
+	!'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	if storyline = 1 and (home_owned[2] = 1 or SchoolBlock = 0):
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
@@ -169,7 +170,8 @@ end
 if $loc = 'cafe_parco':
 	'<center><h4><font color="maroon">Cafe "Del Parco"</font></h4></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/menus/del_parco.png"</center><br>'
+	!'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
 	$_eat['0,price'] = 100
@@ -208,7 +210,8 @@ end
 if $loc = 'kafe':
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/menus/roadhouse.png"</center><br>'
+	!'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
 	$_eat['0,price'] = 80
@@ -394,7 +397,8 @@ end
 if $loc = 'restoran':
 	'<center><b><font color="maroon">Babel</font></b></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/fancydrinks.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/menus/babel.png"</center><br>'
+	!'<center><img <<$set_imgh>> src="images/shared/drinks/fancydrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vareniki with Potatoes'
 	$_eat['0,type'] = 'varenfan'
 	$_eat['0,price'] = 760

+ 68 - 74
locations/obj_din.qsrc

@@ -1243,7 +1243,6 @@ if $ARGS[0] = 'reputation':
 		end
 		if Enable_family_Reputation = 1:
 			'<center><a href="exec:Enable_family_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-			*nl
 			if rinslut > 0 or kavslut > 0:'In the residential area of ​​you are known as a whore that sleeps with Caucasians.'
 			if afra > 80: 'In the student hostel, you are known for bedding blacks.'
 			if opusk > 0 or gnewQW >= 5: 'In the residential area it is well known by all the guys that you are a whore.'
@@ -1285,15 +1284,14 @@ if $ARGS[0] = 'reputation':
 				if brotherbj > 0:'<<brotherbj>> - Number of times you''ve given your brother blowjobs'
 				if brotherfuck > 0:'<<brotherfuck>> - Number of times you''ve had sex with your brother'
 			end
-		end
 		*nl
+		end
 		'<center>Regional Renown</center>'
 		if Enable_glo_Reputation = 0:
 			'<center><a href="exec:Enable_glo_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
 		end
 		if Enable_glo_Reputation = 1:
 			'<center><a href="exec:Enable_glo_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-			*nl
 			'Regional renown as a performer = <<global_performer>>'
 			if global_performer = 0:
 				'You are not famous enough as a performer to be known outside of any local areas.'
@@ -1331,122 +1329,118 @@ if $ARGS[0] = 'reputation':
 			end
 			if Enable_pav_Reputation = 1:
 				'<center><a href="exec:Enable_pav_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-				*nl
 				'<b>Performer = <<pav_performer>></b>'
-				'	Actor = <<pav_acting>>'
-				'	Dancer = <<pav_dance>>'
-				'	Glamour model = <<pav_modelling>>'
-				'	Painter = <<pav_painting>>'
-				'	Musician = <<pav_music>>'
-				'	Ballet dancer = <<pav_ballet>>'
+				'  Actor = <<pav_acting>>'
+				'  Dancer = <<pav_dance>>'
+				'  Glamour model = <<pav_modelling>>'
+				'  Painter = <<pav_painting>>'
+				'  Musician = <<pav_music>>'
+				'  Ballet dancer = <<pav_ballet>>'
 				'<b>Sex Industry = <<pav_sexind>></b>'
-				'	Porn actor = <<pav_porn>>'
-				'	Stripper = <<pav_stripping>>'
+				'  Porn actor = <<pav_porn>>'
+				'  Stripper = <<pav_stripping>>'
 				'<b>Slut = <<pav_slut>></b>'
-				'	Sex = <<pav_sex>>'
-				'	Prostitution = <<pav_prostitute>>'
+				'  Sex = <<pav_sex>>'
+				'  Prostitution = <<pav_prostitute>>'
 				'<b>Sports = <<pav_sport>></b>'
-				'	Kickboxer = <<pav_kickboxing>>'
-				'	Runner = <<pav_running>>'
-				'	Volleyball player = <<pav_volleyball>>'
+				'  Kickboxer = <<pav_kickboxing>>'
+				'  Runner = <<pav_running>>'
+				'  Volleyball player = <<pav_volleyball>>'
 				'<b>Intellectual = <<pav_int>></b>'
-				'	Chess player = <<pav_chess>>'
-				'	Teacher = <<pav_teaching>>'
+				'  Chess player = <<pav_chess>>'
+				'  Teacher = <<pav_teaching>>'
 				'<b>Social = <<pav_social>></b>'
-				'	Social media = <<pav_media>>'
+				'  Social media = <<pav_media>>'
+				*nl
 			end
-			*nl
 			'<center>Renown in the city</center>'
 			if Enable_city_Reputation = 0:
 				'<center><a href="exec:Enable_city_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
 			end
 			if Enable_city_Reputation = 1:
 				'<center><a href="exec:Enable_city_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-				*nl
 				'<b>Performer = <<city_performer>></b>'
-				'	Actor = <<city_acting>>'
-				'	Dancer = <<city_dance>>'
-				'	Glamour model = <<city_modelling>>'
-				'	Painter = <<city_painting>>'
-				'	Musician = <<city_music>>'
-				'	Ballet dancer = <<city_ballet>>'
+				'  Actor = <<city_acting>>'
+				'  Dancer = <<city_dance>>'
+				'  Glamour model = <<city_modelling>>'
+				'  Painter = <<city_painting>>'
+				'  Musician = <<city_music>>'
+				'  Ballet dancer = <<city_ballet>>'
 				'<b>Sex Industry = <<city_sexind>></b>'
-				'	Porn actor = <<city_porn>>'
-				'	Stripper = <<city_stripping>>'
+				'  Porn actor = <<city_porn>>'
+				'  Stripper = <<city_stripping>>'
 				'<b>Slut = <<city_slut>></b>'
-				'	Sex = <<city_sex>>'
-				'	Prostitution = <<city_prostitute>>'
+				'  Sex = <<city_sex>>'
+				'  Prostitution = <<city_prostitute>>'
 				'<b>Sports = <<city_sport>></b>'
-				'	Kickboxer = <<city_kickboxing>>'
-				'	Runner = <<city_running>>'
-				'	Volleyball player = <<city_volleyball>>'
+				'  Kickboxer = <<city_kickboxing>>'
+				'  Runner = <<city_running>>'
+				'  Volleyball player = <<city_volleyball>>'
 				'<b>Intellectual = <<city_int>></b>'
-				'	Chess player = <<city_chess>>'
-				'	Teacher = <<city_teaching>>'
+				'  Chess player = <<city_chess>>'
+				'  Teacher = <<city_teaching>>'
 				'<b>Social = <<city_social>></b>'
-				'	Social media = <<city_media>>'
+				'  Social media = <<city_media>>'
+				*nl
 			end
-			*nl
 			'<center>Renown in the old town</center>'
 			if Enable_oldtown_Reputation = 0:
 				'<center><a href="exec:Enable_oldtown_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
 			end
 			if Enable_oldtown_Reputation = 1:
 				'<center><a href="exec:Enable_oldtown_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-				*nl
 				'<b>Performer = <<oldtown_performer>></b>'
-				'	Actor = <<oldtown_acting>>'
-				'	Dancer = <<oldtown_dance>>'
-				'	Glamour model = <<oldtown_modelling>>'
-				'	Painter = <<oldtown_painting>>'
-				'	Musician = <<oldtown_music>>'
-				'	Ballet dancer = <<oldtown_ballet>>'
+				'  Actor = <<oldtown_acting>>'
+				'  Dancer = <<oldtown_dance>>'
+				'  Glamour model = <<oldtown_modelling>>'
+				'  Painter = <<oldtown_painting>>'
+				'  Musician = <<oldtown_music>>'
+				'  Ballet dancer = <<oldtown_ballet>>'
 				'<b>Sex Industry = <<oldtown_sexind>></b>'
-				'	Porn actor = <<oldtown_porn>>'
-				'	Stripper = <<oldtown_stripping>>'
+				'  Porn actor = <<oldtown_porn>>'
+				'  Stripper = <<oldtown_stripping>>'
 				'<b>Slut = <<oldtown_slut>></b>'
-				'	Sex = <<oldtown_sex>>'
-				'	Prostitution = <<oldtown_prostitute>>'
+				'  Sex = <<oldtown_sex>>'
+				'  Prostitution = <<oldtown_prostitute>>'
 				'<b>Sports = <<oldtown_sport>></b>'
-				'	Kickboxer = <<oldtown_kickboxing>>'
-				'	Runner = <<oldtown_running>>'
-				'	Volleyball player = <<oldtown_volleyball>>'
+				'  Kickboxer = <<oldtown_kickboxing>>'
+				'  Runner = <<oldtown_running>>'
+				'  Volleyball player = <<oldtown_volleyball>>'
 				'<b>Intellectual = <<oldtown_int>></b>'
-				'	Chess player = <<oldtown_chess>>'
-				'	Teacher = <<oldtown_teaching>>'
+				'  Chess player = <<oldtown_chess>>'
+				'  Teacher = <<oldtown_teaching>>'
 				'<b>Social = <<oldtown_social>></b>'
-				'	Social media = <<oldtown_media>>'
+				'  Social media = <<oldtown_media>>'
+				*nl
 			end
-			*nl
 			'<center>Renown in the village</center>'
 			if Enable_village_Reputation = 0:
 				'<center><a href="exec:Enable_village_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
 			end
 			if Enable_village_Reputation = 1:
 				'<center><a href="exec:Enable_village_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-				*nl
 				'<b>Performer = <<village_performer>></b>'
-				'	Actor = <<village_acting>>'
-				'	Dancer = <<village_dance>>'
-				'	Glamour model = <<village_modelling>>'
-				'	Painter = <<village_painting>>'
-				'	Musician = <<village_music>>'
-				'	Ballet dancer = <<village_ballet>>'
+				'  Actor = <<village_acting>>'
+				'  Dancer = <<village_dance>>'
+				'  Glamour model = <<village_modelling>>'
+				'  Painter = <<village_painting>>'
+				'  Musician = <<village_music>>'
+				'  Ballet dancer = <<village_ballet>>'
 				'<b>Sex Industry = <<village_sexind>></b>'
-				'	Porn actor = <<village_porn>>'
-				'	Stripper = <<village_stripping>>'
+				'  Porn actor = <<village_porn>>'
+				'  Stripper = <<village_stripping>>'
 				'<b>Slut = <<village_slut>></b>'
-				'	Sex = <<village_sex>>'
-				'	Prostitution = <<village_prostitute>>'
+				'  Sex = <<village_sex>>'
+				'  Prostitution = <<village_prostitute>>'
 				'<b>Sports = <<village_sport>></b>'
-				'	Kickboxer = <<village_kickboxing>>'
-				'	Runner = <<village_running>>'
-				'	Volleyball player = <<village_volleyball>>'
+				'  Kickboxer = <<village_kickboxing>>'
+				'  Runner = <<village_running>>'
+				'  Volleyball player = <<village_volleyball>>'
 				'<b>Intellectual = <<village_int>></b>'
-				'	Chess player = <<village_chess>>'
-				'	Teacher = <<village_teaching>>'
+				'  Chess player = <<village_chess>>'
+				'  Teacher = <<village_teaching>>'
 				'<b>Social = <<village_social>></b>'
-				'	Social media = <<village_media>>'
+				'  Social media = <<village_media>>'
 			end
 		'</tr></td></table></center>'
 		'</td><td width="50%" cellspacing="0" cellpadding="0" valign="top">'