[Scummvm-git-logs] scummvm master -> d668979520991f93ad0e827b21c8c2dce5e4e309

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d668979520 DEVTOOLS: BLADERUNNER: Fix packing MIX file for EN_ANY


Commit: d668979520991f93ad0e827b21c8c2dce5e4e309
    https://github.com/scummvm/scummvm/commit/d668979520991f93ad0e827b21c8c2dce5e4e309
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-01-20T19:32:29+02:00

Commit Message:
DEVTOOLS: BLADERUNNER: Fix packing MIX file for EN_ANY

Changed paths:
    devtools/create_bladerunner/subtitles/common/extracsTextResource.py
    devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py


diff --git a/devtools/create_bladerunner/subtitles/common/extracsTextResource.py b/devtools/create_bladerunner/subtitles/common/extracsTextResource.py
index f3ee0d4118d..89b2b05f40e 100644
--- a/devtools/create_bladerunner/subtitles/common/extracsTextResource.py
+++ b/devtools/create_bladerunner/subtitles/common/extracsTextResource.py
@@ -19,7 +19,7 @@ EXTRAC_TEXT_RESOURCE_TUPLE_LIST = [
 	(9, "ScummVM", ""),
 	(10, "Westwood Studios", ""),
 	(11, "ix", ""),
-	(12, "jakejakejake1234", ""),
+	(12, "Jarrod O'Rafferty", ""),
 	(13, "Sean Leong (JakeSteven1980)", ""),
 	(14, ":...:", "REQUIRED")
  ]
diff --git a/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py b/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
index ef71aaa9d83..a6db54edc84 100644
--- a/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
+++ b/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
@@ -126,7 +126,7 @@ from subtlsVersTextResource import *
 from extracsTextResource import *
 
 COMPANY_EMAIL = "classic.adventures.in.greek at gmail.com"
-APP_VERSION = "1.95"
+APP_VERSION = "1.96"
 APP_NAME = "packBladeRunnerMIXFromPCTLKXLS"
 APP_WRAPPER_NAME = "mixResourceCreator.py"
 APP_NAME_SPACED = "Blade Runner MIX Resource Creator"
@@ -457,7 +457,7 @@ def getSortMixFilesKey(item):
 def getSupportedInGameQuotesSheetsList():
 	supportedInGameQuotesSheetsList = []
 	for tmpActiveLanguageDescriptionCodeTuple in SUPPORTED_LANGUAGES_DESCRIPTION_CODE_TLIST:
-		if (gActiveLanguageDescriptionCodeTuple[1] != '#' and tmpActiveLanguageDescriptionCodeTuple[1] == gActiveLanguageDescriptionCodeTuple[1]) \
+		if (gActiveLanguageDescriptionCodeTuple[1] != '#' and tmpActiveLanguageDescriptionCodeTuple[1] == gActiveLanguageDescriptionCodeTuple[1] and tmpActiveLanguageDescriptionCodeTuple[0] == gActiveLanguageDescriptionCodeTuple[0]) \
 			or (gActiveLanguageDescriptionCodeTuple[1] == '#' and tmpActiveLanguageDescriptionCodeTuple[1] != '#' and tmpActiveLanguageDescriptionCodeTuple[0] != 'RU_RUS'):
 			supportedInGameQuotesSheetsList += [(x + '%s.TR%s' % (tmpActiveLanguageDescriptionCodeTuple[1], tmpActiveLanguageDescriptionCodeTuple[1])) for x in SUPPORTED_INGAME_DIALOGUE_SHEETS]
 	return supportedInGameQuotesSheetsList
@@ -467,7 +467,7 @@ def getSupportedSubtitleSheetsList():
 	mergedListOfSupportedSubtitleSheets += getSupportedInGameQuotesSheetsList()
 	mergedListOfSupportedSubtitleSheets += [(x + 'E.VQA') for x in SUPPORTED_VIDEO_DIALOGUE_SHEETS_ENGLISH]
 	for tmpActiveLanguageDescriptionCodeTuple in SUPPORTED_LANGUAGES_DESCRIPTION_CODE_TLIST:
-		if (gActiveLanguageDescriptionCodeTuple[1] != '#' and tmpActiveLanguageDescriptionCodeTuple[1] == gActiveLanguageDescriptionCodeTuple[1]) \
+		if (gActiveLanguageDescriptionCodeTuple[1] != '#' and tmpActiveLanguageDescriptionCodeTuple[1] == gActiveLanguageDescriptionCodeTuple[1] and tmpActiveLanguageDescriptionCodeTuple[0] == gActiveLanguageDescriptionCodeTuple[0]) \
 			or (gActiveLanguageDescriptionCodeTuple[1] == '#' and tmpActiveLanguageDescriptionCodeTuple[1] != '#' and tmpActiveLanguageDescriptionCodeTuple[0] != 'RU_RUS'):
 			mergedListOfSupportedSubtitleSheets += [(x + '%s.VQA' % (tmpActiveLanguageDescriptionCodeTuple[1])) for x in SUPPORTED_VIDEO_DIALOGUE_SHEETS_LOCALIZED]
 	return mergedListOfSupportedSubtitleSheets
@@ -482,7 +482,7 @@ def getSupportedTranslatedTrxFilenamesList():
 			listOfSupportedTranslatedTrxFilenames.append(translatedTRxFileName)
 
 	for tmpActiveLanguageDescriptionCodeTuple in SUPPORTED_LANGUAGES_DESCRIPTION_CODE_TLIST:
-		if (gActiveLanguageDescriptionCodeTuple[1] != '#' and tmpActiveLanguageDescriptionCodeTuple[1] == gActiveLanguageDescriptionCodeTuple[1]) \
+		if (gActiveLanguageDescriptionCodeTuple[1] != '#' and tmpActiveLanguageDescriptionCodeTuple[1] == gActiveLanguageDescriptionCodeTuple[1] and tmpActiveLanguageDescriptionCodeTuple[0] == gActiveLanguageDescriptionCodeTuple[0]) \
 			or (gActiveLanguageDescriptionCodeTuple[1] == '#' and tmpActiveLanguageDescriptionCodeTuple[1] != '#' and tmpActiveLanguageDescriptionCodeTuple[0] != 'RU_RUS'):
 			for translatedTRxFileName in [ (x[0] + '%s' % (tmpActiveLanguageDescriptionCodeTuple[1])) for x in SUPPORTED_TRANSLATION_SHEETS[:-2]]:
 				if (gActiveLanguageDescriptionCodeTuple[1] == '#' and tmpActiveLanguageDescriptionCodeTuple[1] == 'E') \