mux voice over videos and bug fixes for mod converter

- The voice over videos will be muxed on the fly during installation (to
save some megabytes ;))
- In EET_modConverter some paths was wrong
- Sirene NPC BG:EE is fully compatible during PCU Conversion.
- Added *.bak files to .gitignore for Winmerge compares

.gitignore

@@ -43,4 +43,7 @@ Temporary Items
 .apdisk
 
 EET/other/Chapter_patcher/Chapter_patcher/Chapter_patcher.tp2
-EET/other/info.txt
+EET/other/info.txt
+
+# Winmerge Backup files
+*.bak

EET/EET.tp2

@@ -114,6 +114,7 @@ ACTION_FOR_EACH tool IN tile2ee tileconv BEGIN
 	PRINT ~%tool% path assigned to EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%%tool%%exe%~
 END
 OUTER_SPRINT tis2bg2 ~EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%tis2bg2%exe%~
+OUTER_SPRINT ffmpeg ~EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%ffmpeg%exe%~
 PRINT ~tis2bg2 path assigned to EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%tis2bg2%exe%~
 
 /////                                                  \\\\\
@@ -3269,15 +3270,16 @@ COPY_LARGE ~EET/base/movies~ ~lang/%LANGUAGE_BG2%/movies~
 
 //copy BG1 movies with voice over
 //INTRO.wbm => INTROBG1.wbm //name must have the same length as hardcoded INTRO15F
-ACTION_IF (FILE_EXISTS ~%tra_path%/%LANGUAGE%/movies/BEREGOST.wbm~)
-AND (FILE_EXISTS ~%tra_path%/%LANGUAGE%/movies/INTROBG1.wbm~)
-AND (FILE_EXISTS ~%tra_path%/%LANGUAGE%/movies/NASHKELL.wbm~)
-AND (FILE_EXISTS ~%tra_path%/%LANGUAGE%/movies/WYVERN.wbm~) BEGIN
-	COPY_LARGE ~%tra_path%/%LANGUAGE%/movies~ ~lang/%LANGUAGE_BG2%/movies~
-END ELSE BEGIN
-	COPY_LARGE ~%tra_path%/en_US/movies~ ~lang/%LANGUAGE_BG2%/movies~
+ACTION_FOR_EACH vidname IN BEREGOST INTROBG1 NASHKELL WYVERN BEGIN
+	ACTION_IF (FILE_EXISTS ~%tra_path%/%LANGUAGE%/movies/%vidname%.ogg~) BEGIN
+		AT_NOW ~%ffmpeg% -i EET%os_slash%base%os_slash%lmovies%os_slash%%vidname%.wbm -i EET%os_slash%lang%os_slash%%LANGUAGE%%os_slash%movies%os_slash%%vidname%.ogg -acodec copy -vcodec copy lang%os_slash%%LANGUAGE%%os_slash%movies%os_slash%%vidname%.webm~
+	END ELSE BEGIN
+		AT_NOW ~%ffmpeg% -i EET%os_slash%base%os_slash%lmovies%os_slash%%vidname%.wbm -i EET%os_slash%lang%os_slash%en_US%os_slash%movies%os_slash%%vidname%.ogg -acodec copy -vcodec copy lang%os_slash%%LANGUAGE%%os_slash%movies%os_slash%%vidname%.webm~
+	END
+	MOVE + ~lang/%LANGUAGE%/movies/%vidname%.webm~ ~lang/%LANGUAGE%/movies/%vidname%.wbm~
 END
 
+
 //update Baldur.ini
 ACTION_IF (FILE_EXISTS ~%USER_DIRECTORY%/Baldur.ini~) BEGIN
 	COPY ~%USER_DIRECTORY%/Baldur.ini~ ~%USER_DIRECTORY%~

EET/docs/[en_US]readme.htm

@@ -678,6 +678,7 @@ <h2>Frequently Asked Questions</h2>
 		<li><a href="http://forum.baldursgate.com/discussion/29207/vynd-drow-assassin-npc-now-available-for-bg-ee-tutu-and-trilogy/p1">Vynd NPC Mod</a> for BGTutu, BGT and BG:EE Version 1</li>
 		<li><a href="http://www.gibberlings3.net/bg_romanticencounters">Baldur's Gate Romantic Encounters Modification</a> Version 1.3</li>
 		<li><a href="http://forums.beamdog.com/discussion/38254/bg1-unfinished-business-v14-beta-with-bgee-compatibility-updated-2015-02-28">BG1 Unfinished Business</a> Version 14 [BETA]</li>
+		<li><a href="https://forums.beamdog.com/discussion/42721/npc-mod-sirene-npc-for-bg-ee-v1-0/p1">Sirene NPC for BG:EE</a> Version 1.0</li>
 	</ul>
 	<p><strong>The Stone of Askavar</strong> and <strong>Drizzt Saga</strong> should be installed choosing second option during installation which adds BP-BGT Wroldmap support (this way both will be compatible with EET Worldmap and BP-BGT Worldmap).</p>
 	<p>Above list also shows install order suggested by <a href="http://www.shsforums.net/files/category/72-big-world-project/">Big World Project</a>. Compatibility with EET doesn't mean that mods are fully compatible with each other - refer to original readme files and forum discussions for compatibility details. Although when it comes to above mentioned files, according to BWP/BWS there aren't any known problems to run them all together. Mods have been tested with versions mentioned in above list. It's unlikely that newer ones will break something, as the compatibility changes made to them during EET installation are minimal, if made at all. Although let me know if it happens.</p>
@@ -834,6 +835,7 @@ <h2>Legalese</h2>
 <p>Tools distributed with this package are under following open licenses:
 <ul>
 	<li>Oggdec and SoX are available under the <a href="http://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License version 3</a> (oggdec source code is available within the <a href="http://www.xiph.org/downloads/">vorbis-tools</a> package, SoX source code can be found at <a href="http://sox.sourceforge.net/">sourceforge</a>)</li>
+	<li>FFmpeg is available under the <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU Lesser General Public License (LGPL) version 2.1</a>, some parts of it are available under the <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License (GPL) version 2</a>, source code available at <a href="https://www.ffmpeg.org/download.html#get-sources">FFmpeg.org</a> </li>
 	<li>tileconv and tile2ee are distributed under the terms and conditions of the <a href="http://opensource.org/licenses/MIT">MIT license</a>, source code available at <a href="https://github.com/Argent77/">GitHub</a></li>
 	<li>WeiDU is distributed under the <a href="http://www.gnu.org/licenses/lgpl-3.0.html">LGPL public license</a>, source code available at <a href="http://www.weidu.org/">weidu.org</a></li>
 </ul>
@@ -849,7 +851,7 @@ <h2>Version history</h2>
 
 <p><a href="#" onclick="toggle('1.0'); return false;">Expand/Collapse All</a></p>
 
-<h6><a href="#" onclick="toggle('1.0'); return false;">Version 1.0 (01 August 15)</a></h6>
+<h6><a href="#" onclick="toggle('1.0'); return false;">Version 1.0 (08 August 15)</a></h6>
 
 <ul class="vlisthide" id="1.0">
 	<li>First public release</li>

EET/other/EET_modConverter/EET_modConverter/lib/PCU_Dict_bgt-eet.tph

@@ -11,20 +11,20 @@ OUTER_WHILE NOT (IS_AN_INT %songlist%) || (songlist > 5) || (songlist < 1) BEGIN
  4. Custom
  5. Don't patch ARE music offsets~
 	ACTION_READLN songlist
-	ACTION_IF (songlist = 4) AND (NOT FILE_EXISTS ~PCU_custom/Input/songlist.2da~) BEGIN
-		PRINT ~Custom songlist.2da not found in PCU_custom/Input/ directory~
+	ACTION_IF (songlist = 4) AND (NOT FILE_EXISTS ~EET_modConverter/Input/songlist.2da~) BEGIN
+		PRINT ~Custom songlist.2da not found in EET_modConverter/Input/ directory~
 		OUTER_SPRINT songlist ~~
 	END
 END
 
 ACTION_IF (songlist = 1) BEGIN
-	OUTER_SPRINT file ~PCU_custom/lib/songlist_bgt_bg1full.2da~
+	OUTER_SPRINT file ~EET_modConverter/lib/songlist_bgt_bg1full.2da~
 END ELSE ACTION_IF (songlist = 2) BEGIN
-	OUTER_SPRINT file ~PCU_custom/lib/songlist_bgt_hybrid.2da~
+	OUTER_SPRINT file ~EET_modConverter/lib/songlist_bgt_hybrid.2da~
 END ELSE ACTION_IF (songlist = 3) BEGIN
-	OUTER_SPRINT file ~PCU_custom/lib/songlist_bgt_full.2da~
+	OUTER_SPRINT file ~EET_modConverter/lib/songlist_bgt_full.2da~
 END ELSE ACTION_IF (songlist = 4) BEGIN
-	OUTER_SPRINT file ~PCU_custom/Input/songlist.2da~
+	OUTER_SPRINT file ~EET_modConverter/Input/songlist.2da~
 END
 
 ACTION_IF (songlist != 5) BEGIN
@@ -47,7 +47,7 @@ ACTION_IF (songlist != 5) BEGIN
 			READ_2DA_ENTRY cnt 2 3 "col3"
 			SET EVALUATE_BUFFER "dword_mus_source%cnt%" = col1
 			INNER_ACTION BEGIN
-				COPY - ~PCU_custom/lib/songlist_eet.2da~ ~PCU_custom/lib~
+				COPY - ~EET_modConverter/lib/songlist_eet.2da~ ~EET_modConverter/lib~
 					PRETTY_PRINT_2DA
 					COUNT_2DA_ROWS 3 "cntrow2"
 					FOR (cnt2 = 1; cnt2 < "%cntrow2%"; cnt2 = cnt2 + 1) BEGIN

EET/other/EET_modConverter/EET_modConverter/lib/PCU_Dict_eet-bgee.tph

@@ -2,7 +2,7 @@
 ///// Preparing MUS variables                          \\\\\
 /////                                                  \\\\\
 
-COPY - ~PCU_custom/lib/songlist_eet.2da~ ~PCU_custom/lib~
+COPY - ~EET_modConverter/lib/songlist_eet.2da~ ~EET_modConverter/lib~
 	PRETTY_PRINT_2DA
 	REPLACE_TEXTUALLY ~ BC3\.MUS~ ~ BC1.MUS~
 	REPLACE_TEXTUALLY ~ BC4\.MUS~ ~ BC2.MUS~
@@ -25,7 +25,7 @@ COPY - ~PCU_custom/lib/songlist_eet.2da~ ~PCU_custom/lib~
 		READ_2DA_ENTRY cnt 2 3 "col3"
 		SET EVALUATE_BUFFER "dword_mus_source%cnt%" = col1
 		INNER_ACTION BEGIN
-			COPY - ~PCU_custom/lib/songlist_ee.2da~ ~PCU_custom/lib~
+			COPY - ~EET_modConverter/lib/songlist_ee.2da~ ~EET_modConverter/lib~
 				PRETTY_PRINT_2DA
 				COUNT_2DA_ROWS 3 "cntrow2"
 				FOR (cnt2 = 1; cnt2 < "%cntrow2%"; cnt2 = cnt2 + 1) BEGIN

EET/tbl/compatibility.tbl

@@ -23,3 +23,4 @@ GARRICK_FLIRT 0     //Garrick's Infatuation for BG
 VYND 1              //Vynd for BGTutu, BGT and BG:EE
 BG1RE 1             //Baldur's Gate Romantic Encounters Modification
 BG1UB 1             //BG1 Unfinished Business
+SIRENE 0			//Sirene NPC for BG:EE