[Scummvm-git-logs] scummvm master -> a8420f57fb66e35c3bfe6af4de3be909d909a7a1
antoniou79
a.antoniou79 at gmail.com
Sat Jan 18 23:29:55 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4d260ea349 BLADERUNNER: SUBTITLES: Added TB_FLY to subtitle-able videos
a8420f57fb DEVTOOLS: BLADERUNNER: Support TB_FLY sheet subtitles
Commit: 4d260ea3492c7674192a253dc210111991ad7b63
https://github.com/scummvm/scummvm/commit/4d260ea3492c7674192a253dc210111991ad7b63
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-01-19T01:28:00+02:00
Commit Message:
BLADERUNNER: SUBTITLES: Added TB_FLY to subtitle-able videos
Changed paths:
engines/bladerunner/script/ai/holloway.cpp
engines/bladerunner/script/scene/tb02.cpp
engines/bladerunner/subtitles.cpp
engines/bladerunner/subtitles.h
diff --git a/engines/bladerunner/script/ai/holloway.cpp b/engines/bladerunner/script/ai/holloway.cpp
index c7eb29e..ae3aa18 100644
--- a/engines/bladerunner/script/ai/holloway.cpp
+++ b/engines/bladerunner/script/ai/holloway.cpp
@@ -174,7 +174,7 @@ bool AIScriptHolloway::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Ambient_Sounds_Remove_All_Looping_Sounds(1);
Player_Gains_Control();
- Outtake_Play(kOuttakeInterrogation, 0, 1);
+ Outtake_Play(kOuttakeInterrogation, false, 1);
if (Global_Variable_Query(kVariableHollowayArrest) == 1) {
Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR08ReadyToRun);
diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp
index 28c84d5..77394b7 100644
--- a/engines/bladerunner/script/scene/tb02.cpp
+++ b/engines/bladerunner/script/scene/tb02.cpp
@@ -34,7 +34,7 @@ void SceneScriptTB02::InitializeScene() {
} else {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
Ambient_Sounds_Remove_All_Looping_Sounds(1);
- Outtake_Play(kOuttakeTyrellBuildingFly, false, -1);
+ Outtake_Play(kOuttakeTyrellBuildingFly, false, -1); // TB_FLY_#.VQA Note: this is the only fly-through scene that is localized!
Setup_Scene_Information(-304.0f, -81.46f, 1434.0f, 250);
}
if (Global_Variable_Query(kVariableChapter) > 3) {
diff --git a/engines/bladerunner/subtitles.cpp b/engines/bladerunner/subtitles.cpp
index e0b7378..a1f12f2 100644
--- a/engines/bladerunner/subtitles.cpp
+++ b/engines/bladerunner/subtitles.cpp
@@ -92,7 +92,8 @@ const char *Subtitles::SUBTITLES_FILENAME_PREFIXES[kMaxTextResourceEntries] = {
"END01D", // 22
"END01E", // 23
"END01F", // 24
- "END03" // 25
+ "END03", // 25
+ "TB_FLY" // 26
};
/**
diff --git a/engines/bladerunner/subtitles.h b/engines/bladerunner/subtitles.h
index b84e0cf..713e45e 100644
--- a/engines/bladerunner/subtitles.h
+++ b/engines/bladerunner/subtitles.h
@@ -45,7 +45,7 @@ class Subtitles {
static const uint kPreferedLine = 2; // Prefer drawing from this line (the bottom-most of available subtitle lines index is 0) by default
static const int kMarginBottom = 12; // In pixels. This is the bottom margin beneath the subtitles space
static const int kTextMaxWidth = 610; // In pixels
- static const int kMaxTextResourceEntries = 1 + 25; // Support in-game subs (1) and all possible VQAs (25) with spoken dialogue or translatable text
+ static const int kMaxTextResourceEntries = 27; // Support in-game subs (1) and all possible VQAs (26) with spoken dialogue or translatable text
static const char *SUBTITLES_FILENAME_PREFIXES[kMaxTextResourceEntries];
static const char *SUBTITLES_FONT_FILENAME_EXTERNAL;
static const char *SUBTITLES_VERSION_TRENAME;
Commit: a8420f57fb66e35c3bfe6af4de3be909d909a7a1
https://github.com/scummvm/scummvm/commit/a8420f57fb66e35c3bfe6af4de3be909d909a7a1
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-01-19T01:28:01+02:00
Commit Message:
DEVTOOLS: BLADERUNNER: Support TB_FLY sheet subtitles
Changed paths:
devtools/create_bladerunner/subtitles/common/vqasTextResource.py
devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
devtools/create_bladerunner/subtitles/module.mk
devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py
diff --git a/devtools/create_bladerunner/subtitles/common/vqasTextResource.py b/devtools/create_bladerunner/subtitles/common/vqasTextResource.py
index 77f5292..e2f93f2 100644
--- a/devtools/create_bladerunner/subtitles/common/vqasTextResource.py
+++ b/devtools/create_bladerunner/subtitles/common/vqasTextResource.py
@@ -2,7 +2,7 @@
# -*- coding: UTF-8 -*-
#
-my_module_version = "1.00"
+my_module_version = "1.60"
my_module_name = "vqasTextResource"
# Timestamps and placeholder cells for all supported VQAs ((row 2 and below)
@@ -425,6 +425,9 @@ END06_VQA_TEXT_RESOURCE_TUPLE_LIST = [
(175, 226, " ", "00:00:12", "00:00:15.10", "Steele")
]
##
+TB_FLY_VQA_TEXT_RESOURCE_TUPLE_LIST = [
+ (11, 50, " ", "00:00:01", "00:00:03.37", "Blimp Guy")
+]
##
##
##
@@ -453,7 +456,8 @@ ALL_VQA_TEXT_RESOURCES_LISTS = [
("END04A_", END04A_VQA_TEXT_RESOURCE_TUPLE_LIST),
("END04B_", END04B_VQA_TEXT_RESOURCE_TUPLE_LIST),
("END04C_", END04C_VQA_TEXT_RESOURCE_TUPLE_LIST),
- ("END06_", END06_VQA_TEXT_RESOURCE_TUPLE_LIST)
+ ("END06_", END06_VQA_TEXT_RESOURCE_TUPLE_LIST),
+ ("TB_FLY_", TB_FLY_VQA_TEXT_RESOURCE_TUPLE_LIST)
]
#
#
diff --git a/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py b/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
index c1b655e..855a00f 100644
--- a/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
+++ b/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
@@ -125,7 +125,7 @@ from struct import *
from subtlsVersTextResource import *
COMPANY_EMAIL = "classic.adventures.in.greek at gmail.com"
-APP_VERSION = "1.50"
+APP_VERSION = "1.60"
APP_NAME = "packBladeRunnerMIXFromPCTLKXLS"
APP_WRAPPER_NAME = "mixResourceCreator.py"
APP_NAME_SPACED = "Blade Runner MIX Resource Creator"
@@ -146,7 +146,7 @@ SUPPORTED_INGAME_DIALOGUE_SHEETS = ['INGQUO_']
# Video cut-scenes' dialogue sheets - these need the appendix of (x) for the language code, and a suffix of '.VQA'.
# These two first videos seem to be in _E (english) language across translations
SUPPORTED_VIDEO_DIALOGUE_SHEETS_ENGLISH = ['WSTLGO_', 'BRLOGO_']
-SUPPORTED_VIDEO_DIALOGUE_SHEETS_LOCALIZED = ['INTRO_', 'MW_A_', 'MW_B01_', 'MW_B02_', 'MW_B03_', 'MW_B04_', 'MW_B05_', 'INTRGT_', 'MW_D_', 'MW_C01_', 'MW_C02_', 'MW_C03_', 'END04A_', 'END04B_', 'END04C_', 'END06_', 'END01A_', 'END01B_', 'END01C_', 'END01D_', 'END01E_', 'END01F_', 'END03_']
+SUPPORTED_VIDEO_DIALOGUE_SHEETS_LOCALIZED = ['INTRO_', 'MW_A_', 'MW_B01_', 'MW_B02_', 'MW_B03_', 'MW_B04_', 'MW_B05_', 'INTRGT_', 'MW_D_', 'MW_C01_', 'MW_C02_', 'MW_C03_', 'END04A_', 'END04B_', 'END04C_', 'END06_', 'END01A_', 'END01B_', 'END01C_', 'END01D_', 'END01E_', 'END01F_', 'END03_', 'TB_FLY_']
#
# Each Text Resource (TRx) sheet gets a specific font to handle their translation to Text Resource
# TAHOMA means both TAHOMA Fonts (18 and 24)(their translation should be identical (although in the original they have minor differences but they don't affect anything)
diff --git a/devtools/create_bladerunner/subtitles/module.mk b/devtools/create_bladerunner/subtitles/module.mk
index e23385a..f978bd7 100644
--- a/devtools/create_bladerunner/subtitles/module.mk
+++ b/devtools/create_bladerunner/subtitles/module.mk
@@ -8,7 +8,7 @@ FONT_OUTPUT := SUBTLS_E.FON
BLADERUNNER_SUBTITLES_SCRIPTS_ROOT_FOLDER := $(srcdir)/devtools/create_bladerunner/subtitles
BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER := $(srcdir)/devtools/create_bladerunner/subtitles/sampleInput
INTERMEDIATE_RESOURCE_FILES_UI := OPTIONS.TR* DLGMENU.TR* SCORERS.TR* VK.TR* CLUES.TR* CRIMES.TR* ACTORS.TR* HELP.TR* AUTOSAVE.TR* ERRORMSG.TR* SPINDEST.TR* KIA.TR* KIACRED.TR* CLUETYPE.TR* ENDCRED.TR* POGO.TR* SBTLVERS.TR*
-INTERMEDIATE_RESOURCE_FILES_SUBS := INGQUO_*.TR* WSTLGO_E.TR* BRLOGO_E.TR* INTRO_*.TR* MW_A_*.TR* MW_B01_*.TR* MW_B02_*.TR* MW_B03_*.TR* MW_B04_*.TR* MW_B05_*.TR* INTRGT_*.TR* MW_D_*.TR* MW_C01_*.TR* MW_C02_*.TR* MW_C03_*.TR* END04A_*.TR* END04B_*.TR* END04C_*.TR* END06_*.TR* END01A_*.TR* END01B_*.TR* END01C_*.TR* END01D_*.TR* END01E_*.TR* END01F_*.TR* END03_*.TR*
+INTERMEDIATE_RESOURCE_FILES_SUBS := INGQUO_*.TR* WSTLGO_E.TR* BRLOGO_E.TR* INTRO_*.TR* MW_A_*.TR* MW_B01_*.TR* MW_B02_*.TR* MW_B03_*.TR* MW_B04_*.TR* MW_B05_*.TR* INTRGT_*.TR* MW_D_*.TR* MW_C01_*.TR* MW_C02_*.TR* MW_C03_*.TR* END04A_*.TR* END04B_*.TR* END04C_*.TR* END06_*.TR* END01A_*.TR* END01B_*.TR* END01C_*.TR* END01D_*.TR* END01E_*.TR* END01F_*.TR* END03_*.TR* TB_FLY_*.TR*
INPUT_TRANSCRIPT_FILENAME := englishTranscript.xls
INPUT_TRANSCRIPT_FILEPATH := $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_TRANSCRIPT_FILENAME)
diff --git a/devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py b/devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py
index 0bf8618..c358e13 100644
--- a/devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py
+++ b/devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py
@@ -76,7 +76,7 @@ from vqasTextResource import *
#sys.setdefaultencoding('utf8')
COMPANY_EMAIL = "classic.adventures.in.greek at gmail.com"
-APP_VERSION = "0.85"
+APP_VERSION = "1.60"
APP_NAME = "sortBladeRunnerWavs"
APP_WRAPPER_NAME = "quotesSpreadsheetCreator.py"
APP_NAME_SPACED = "Blade Runner Transcript Excel Creator (bare bones)"
@@ -138,7 +138,8 @@ SUPPORTED_PLACEHOLDER_VQA_LOCALIZED_FILES = [
('END04A_', 'Moonbus Ending - Start', '7933.333 ms, 119 frames'),
('END04B_', 'Moonbus Ending - With Lucy', '6533.333 ms, 98 frames'),
('END04C_', 'Moonbus Ending - With Dektora', '7733.333 ms, 116 frames'),
- ('END06_', 'Kipple Ending - With Steele', '36400 ms, 546 frames')
+ ('END06_', 'Kipple Ending - With Steele', '36400 ms, 546 frames'),
+ ('TB_FLY_', 'Fly-through to Tyrell Building', '13533.333 ms, 203 frames')
]
SUPPORTED_SPECIAL_POGO_FILE = 'POGO.TR'
SUPPORTED_DIALOGUE_VERSION_SHEET = 'SBTLVERS.TRE'
More information about the Scummvm-git-logs
mailing list