Skip to content

Commit

Permalink
Version 1.0 Release Candidate 2
Browse files Browse the repository at this point in the history
- fixed GOG and Steam SoD support
- fixed error message during installation (harmless, so no need to
reinstall)
- fixed dream script conversion names (shouldn't affect anyone who
didn't install BG1NPC Project)
- updated compatibility patch for BG1 NPC Project to support latest
version (Dynaheir romance component)
- new question added to F.A.Q. section of the readme file regarding
installation order
- improved language support
  • Loading branch information
K4thos committed Jul 28, 2016
1 parent 0ee06bb commit 6e05754
Show file tree
Hide file tree
Showing 24 changed files with 3,750 additions and 147 deletions.
85 changes: 44 additions & 41 deletions EET/EET.tp2
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ echo %%var%%>EET/temp/%var%.txt
END
PRINT ~%var% = %dir%~
ACTION_FOR_EACH dir2 IN ~/BeamDog/Games/00806~ ~/Baldur's Gate Enhanced Edition/Data/00806~ BEGIN
ACTION_IF (FILE_EXISTS ~%dir%%dir2%/data/SoDAreas.bif~) AND (first_prompt = 0) BEGIN
ACTION_IF (FILE_EXISTS ~%dir%%dir2%/movies/sodcin05.wbm~) AND (first_prompt = 0) BEGIN
OUTER_SPRINT bgee_dir ~%dir%%dir2%~
OUTER_SET first_prompt = 1
PRINT ~%bgee_dir% directory assigned to default dir~
Expand All @@ -207,7 +207,7 @@ echo %%var%%>EET/temp/%var%.txt
END
END ELSE ACTION_IF ~%WEIDU_OS%~ STRING_EQUAL_CASE ~osx~ BEGIN
ACTION_FOR_EACH dir IN ~%quote%/Applications/Baldur's Gate - Enhanced Edition/Game Data/00777/Baldur's Gate - Enhanced Edition.app/Contents/Resources%quote%~ ~%quote%/Applications/Baldur's Gate - Enhanced Edition.app/Contents/Resources%quote%~ ~%quote%%tilde%/Library/Application Support/Steam/SteamApps/common/Baldur's Gate Enhanced Edition/Baldur's Gate - Enhanced Edition.app/Contents/Resources%quote%~ ~%quote%/Applications/Baldur's Gate Enhanced Edition.app/Contents/Resources/game/Baldur's Gate - Enhanced Edition.app/Contents/Resources%quote%~ BEGIN
ACTION_IF (FILE_EXISTS ~%dir%/data/SoDAreas.bif~) AND (first_prompt = 0) BEGIN
ACTION_IF (FILE_EXISTS ~%dir%/movies/sodcin05.wbm~) AND (first_prompt = 0) BEGIN
OUTER_SPRINT bgee_dir ~%dir%~
OUTER_SET first_prompt = 1
PRINT ~%bgee_dir% directory assigned to default dir~
Expand Down Expand Up @@ -245,7 +245,7 @@ OUTER_WHILE (valid_dir = 0) BEGIN
REPLACE_TEXTUALLY ~/*$~ ~~ //remove terminal slashes//*/
END
END
ACTION_IF NOT (FILE_EXISTS ~%bgee_dir%/data/SoDAreas.bif~) BEGIN
ACTION_IF NOT (FILE_EXISTS ~%bgee_dir%/movies/sodcin05.wbm~) BEGIN
PRINT ~~
PRINT @900005 //Invalid BG:EE directory, or incorrect BG:EE installation. It is safe to abort this installation by closing this window or pressing Ctrl+C.
PRINT @900004 //Enter the full path to your BG:EE installation then press Enter. Example: C:\Program Files (x86)\BeamDog\Games\00806
Expand Down Expand Up @@ -309,47 +309,50 @@ END
///// Confirm / create weidu.conf \\\\\
///// \\\\\

OUTER_SPRINT ~LANGUAGEcase~ ~%LANGUAGE%~
OUTER_SPRINT LANGUAGEcase ~%LANGUAGE%~
ACTION_TO_LOWER LANGUAGEcase

<<<<<<<< .../weidu.conf
lang_dir = %LANGUAGEcase%>>>>>>>>

ACTION_FOR_EACH dir IN "%bgee_dir%" "%bg2ee_dir%" BEGIN
ACTION_IF NOT FILE_EXISTS ~%dir%/weidu.conf~ BEGIN
COPY ~.../weidu.conf~ ~%dir%/weidu.conf~ EVALUATE_BUFFER
PATCH_PRINT ~weidu.conf created within BG:EE directory and set to %LANGUAGEcase%~
END ELSE BEGIN
COPY - ~%dir%/weidu.conf~ ~%dir%~
READ_2DA_ENTRY 0 2 3 "compareWith"
PATCH_IF (("%LANGUAGEcase%" STRING_EQUAL_CASE "%compareWith%")=1) BEGIN
PATCH_PRINT ~%dir%/weidu.conf detected with the same language setting as the installation: %LANGUAGEcase%~
END ELSE PATCH_IF FILE_EXISTS ~%dir%/lang/%LANGUAGE%/dialog.tlk~ BEGIN
PATCH_IF (~%argv[0]%~ STRING_CONTAINS_REGEXP ~0~ = 0) BEGIN
SPRINT conf_prompt ~y~
END ELSE PATCH_IF (~%argv[0]%~ STRING_CONTAINS_REGEXP ~1~ = 0) BEGIN
SPRINT conf_prompt ~n~
END ELSE BEGIN
SPRINT conf_prompt ~a~
WHILE (~%conf_prompt%~ STRING_MATCHES_REGEXP ~[YyNn]~) BEGIN
PATCH_PRINT @900010 //%dir%/weidu.conf file has %compareWith% language set instead of %LANGUAGEcase%. Is this correct? [Y]es (keep it as it is) or [N]o (change it to %LANGUAGEcase%)
PATCH_READLN ~conf_prompt~
END
END
PATCH_IF ((~%conf_prompt%~ STRING_EQUAL_CASE ~n~)=1) BEGIN
PATCH_PRINT ~%dir%/weidu.conf %compareWith% changed to %LANGUAGEcase%~
INNER_ACTION BEGIN
COPY ~.../weidu.conf~ ~%dir%/weidu.conf~ EVALUATE_BUFFER
END
END ELSE BEGIN
SPRINT LANGUAGEcase ~%LANGUAGE%~ EVALUATE_BUFFER
ACTION_IF NOT FILE_EXISTS ~%bgee_dir%/weidu.conf~ BEGIN
COPY ~.../weidu.conf~ ~%bgee_dir%/weidu.conf~ EVALUATE_BUFFER
PATCH_PRINT ~weidu.conf created within BG:EE directory and set to %LANGUAGEcase%~
END ELSE BEGIN
COPY ~%bgee_dir%/weidu.conf~ ~%bgee_dir%/weidu.conf~
READ_2DA_ENTRY 0 2 3 "compareWith"
PATCH_IF (("%LANGUAGEcase%" STRING_EQUAL_CASE "%compareWith%")=1) BEGIN
PATCH_PRINT ~%bgee_dir%/weidu.conf detected with the same language setting as the installation: %LANGUAGEcase%~
END ELSE PATCH_IF FILE_EXISTS ~%bgee_dir%/lang/%LANGUAGE%/dialog.tlk~ BEGIN
PATCH_IF (~%argv[0]%~ STRING_CONTAINS_REGEXP ~1~ = 0) BEGIN
SPRINT conf_prompt ~y~
END ELSE PATCH_IF (~%argv[0]%~ STRING_CONTAINS_REGEXP ~2~ = 0) BEGIN
SPRINT conf_prompt ~n~
END ELSE BEGIN
SPRINT conf_prompt ~z~
END
WHILE (~%conf_prompt%~ STRING_MATCHES_REGEXP ~[YyNn]~) BEGIN
PATCH_PRINT @900010 //%bgee_dir%/weidu.conf file has "%compareWith%" language set instead of "%LANGUAGEcase%". Is this correct? [Y]es (keep it as it is) or [N]o (change it to "%LANGUAGEcase%")
PATCH_READLN ~conf_prompt~
END
PATCH_IF ((~%conf_prompt%~ STRING_EQUAL_CASE ~n~)=1) BEGIN
PATCH_PRINT ~%bgee_dir%/weidu.conf %compareWith% changed to %LANGUAGEcase%~
INNER_ACTION BEGIN
COPY ~.../weidu.conf~ ~%bgee_dir%/weidu.conf~ EVALUATE_BUFFER
END
END ELSE BEGIN
PATCH_PRINT ~%bgee_dir%/weidu.conf %compareWith% kept as it is~
END
END
END ELSE BEGIN
PATCH_PRINT ~%bgee_dir%/weidu.conf will keep %compareWith% language - %bgee_dir%/lang/%LANGUAGE%/dialog.tlk doesn't exist.~
END
BUT_ONLY
END

COPY - ~weidu.conf~ ~weidu.conf~
COPY ~weidu.conf~ ~weidu.conf~
READ_2DA_ENTRY 0 2 3 "LANGUAGE_BG2"
BUT_ONLY

PRINT ~LANGUAGE_BG2 = %LANGUAGE_BG2%~

///// \\\\\
Expand All @@ -359,7 +362,7 @@ PRINT ~LANGUAGE_BG2 = %LANGUAGE_BG2%~
PRINT ~~
PRINT ~Extracting texts for translation from BG:EE...~

ACTION_IF FILE_EXISTS ~%bgee_dir%/lang/%LANGUAGEcase%/dialog.tlk~ BEGIN
ACTION_IF FILE_EXISTS ~%bgee_dir%/lang/%LANGUAGE%/dialog.tlk~ BEGIN
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --use-lang "%LANGUAGEcase%" --traify-tlk --min 0 --max 33999 --out "EET/bgee01.tra"~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --use-lang "%LANGUAGEcase%" --traify-tlk --min 34000 --max 71119 --out "EET/bgee02.tra"~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --use-lang "%LANGUAGEcase%" --traify-tlk --min 71120 --out "EET/bgee03.tra"~
Expand Down Expand Up @@ -477,7 +480,7 @@ ACTION_FOR_EACH var IN are bcs chr cre dlg eff ini itm pro spl sto vef vvc wed B
PRINT ~~
PRINT ~Preparing %var% files...~
MKDIR ~%patch_dir%/%var%~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --out "%patch_dir%/%var%" --biff-get-rest "^.*\.%var%$"~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --use-lang "%LANGUAGEcase%" --out "%patch_dir%/%var%" --biff-get-rest "^.*\.%var%$"~
LAM bash_log
ACTION_FOR_EACH dir IN ~%bgee_dir%/override~ ~%bgee_dir%/lang/%LANGUAGE%/override~ BEGIN
ACTION_BASH_FOR ~%dir%~ ~^.+\.%var%$~ BEGIN
Expand All @@ -493,7 +496,7 @@ ACTION_FOR_EACH file IN baldur.gam worldmap.wmp bgmap.wmp sodmap.wmp BEGIN
ACTION_IF (FILE_EXISTS ~%bgee_dir%/override/%file%~) BEGIN
COPY_LARGE + ~%bgee_dir%/override/%file%~ ~%patch_dir%~
END ELSE BEGIN
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --out "%patch_dir%" --biff-get-rest "%file%"~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --use-lang "%LANGUAGEcase%" --out "%patch_dir%" --biff-get-rest "%file%"~
LAM bash_log
END
END
Expand All @@ -516,7 +519,7 @@ END
ACTION_FOR_EACH var IN bam bmp mos tis pvrz BEGIN
PRINT ~~
PRINT ~Preparing %var% files...~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --out "EET%os_slash%temp%os_slash%biff" --biff-get-rest "^.*\.%var%$"~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --use-lang "%LANGUAGEcase%" --out "EET%os_slash%temp%os_slash%biff" --biff-get-rest "^.*\.%var%$"~
LAM bash_log
ACTION_FOR_EACH dir IN ~%bgee_dir%/override~ ~%bgee_dir%/lang/%LANGUAGE%/override~ BEGIN
ACTION_BASH_FOR ~%dir%~ ~^.+\.%var%$~ BEGIN
Expand All @@ -532,7 +535,7 @@ ACTION_FOR_EACH var IN 2da /*plt*/ wav wbm wfx BEGIN
PRINT ~~
PRINT ~Preparing %var% files...~
MKDIR ~EET/temp/%var%~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --out "EET/temp/%var%" --biff-get-rest "^.*\.%var%$"~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --use-lang "%LANGUAGEcase%" --out "EET/temp/%var%" --biff-get-rest "^.*\.%var%$"~
LAM bash_log
ACTION_FOR_EACH dir IN ~%bgee_dir%/override~ ~%bgee_dir%/lang/%LANGUAGE%/override~ BEGIN
ACTION_BASH_FOR ~%dir%~ ~^.+\.%var%$~ BEGIN
Expand All @@ -548,7 +551,7 @@ ACTION_FOR_EACH file IN animate.ids anisnd.ids class.ids gtimes.ids kit.ids miss
ACTION_IF (FILE_EXISTS ~%bgee_dir%/override/%file%~) BEGIN
COPY_LARGE + ~%bgee_dir%/override/%file%~ ~EET/temp/array~
END ELSE BEGIN
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --out "EET/temp/array" --biff-get-rest "%file%"~
AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --logapp --log "EET/temp/bash.debug" --game "%bgee_dir%" --use-lang "%LANGUAGEcase%" --out "EET/temp/array" --biff-get-rest "%file%"~
LAM bash_log
END
END
Expand Down Expand Up @@ -2388,7 +2391,7 @@ ACTION_FOR_EACH vidname IN BEREGOST INTRO_ NASHKELL WYVERN BEGIN
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 EET%os_slash%temp%os_slash%%vidname%.webm~
END
COPY_LARGE ~EET/temp/%vidname%.webm~ ~lang/%LANGUAGE%/movies/%vidname%.wbm~
COPY_LARGE ~EET/temp/%vidname%.webm~ ~lang/%LANGUAGE_BG2%/movies/%vidname%.wbm~
END

//other movies
Expand Down
78 changes: 0 additions & 78 deletions EET/compat/bg1npc/include.tph
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
//Compatibility with BG1NPC Required Modifications

ACTION_IF (FILE_EXISTS ~WeiDU-BGEE.log~) AND (FILE_CONTAINS ~WeiDU-BGEE.log~ ~BG1NPC\.TP2. #[0-9]+ #0 ~) BEGIN
EXTEND_TOP ~REDDEATH.BCS~ ~EET/compat/bg1npc/baf/X#BRDWI.BAF~ EVALUATE_BUFFER //Interjection scripting changes, BG1 NPCs

//delete files existing in BG2:EE
DELETE + ~%patch_dir%/dlg/PLAYER1.dlg~
END

//Compatibility with BG1NPC Banters, Quests, and Interjections

ACTION_IF (FILE_EXISTS ~WeiDU-BGEE.log~) AND (FILE_CONTAINS ~WeiDU-BGEE.log~ ~BG1NPC\.TP2. #[0-9]+ #1 ~) BEGIN
EXTEND_TOP ~NIEMAIN.BCS~ ~EET/compat/bg1npc/baf/X#NIEMAIN.BAF~ EVALUATE_BUFFER

Expand Down Expand Up @@ -39,88 +36,13 @@ ACTION_IF (FILE_EXISTS ~WeiDU-BGEE.log~) AND (FILE_CONTAINS ~WeiDU-BGEE.log~ ~BG
END

//Compatibility with BG1NPC "The BG1 NPC Project: Add Non-Joinable NPC portraits to quests and dialogues" component

ACTION_IF (FILE_EXISTS ~WeiDU-BGEE.log~) AND (FILE_CONTAINS ~WeiDU-BGEE.log~ ~BG1NPC\.TP2. #[0-9]+ #8 ~) BEGIN
//delete files existing in BG2:EE
DELETE + ~%biff_dir%/sarevoks.bmp~
END

//Compatibility with BG1NPC "Dynaheir's Romance Core (teen content)" component

//Disable Dynaheir's End Cutscene (EET implements different transition, so just like in BGT case this cutscene should be disabled)
ACTION_IF (FILE_EXISTS ~WeiDU-BGEE.log~) AND (FILE_CONTAINS ~WeiDU-BGEE.log~ ~BG1NPC\.TP2. #[0-9]+ #12 ~) BEGIN
<<<<<<<< .../EET/compat/bg1npc/baf/ar0125-rbOld.baf
IF
InParty("dynaheir")
!Dead("dynaheir")
!Global("X#DynaheirRomanceInactive","GLOBAL",1)
OR(2)
Global("X#DynaheirRomanceActive","GLOBAL",1)
Global("X#DynaheirRomanceActive","GLOBAL",2)
Global("DeathOfSarevok","GLOBAL",0)
THEN
RESPONSE #100
SetGlobal("DeathOfSarevok","GLOBAL",-1)
Continue()
END

IF
InParty("dynaheir")
!Dead("dynaheir")
!Global("X#DynaheirRomanceInactive","GLOBAL",1)
OR(2)
Global("X#DynaheirRomanceActive","GLOBAL",1)
Global("X#DynaheirRomanceActive","GLOBAL",2)
Dead("sarevok")
GlobalTimerExpired("DeathOfSarevok","GLOBAL")
Global("endofbg1","GLOBAL",0)
Global("X#DynaDeath","GLOBAL",0)
THEN
RESPONSE #100
SetGlobal("X#DynaDeath","GLOBAL",1)
AddexperienceParty(15000)
StartCutSceneMode()
ClearAllActions()
MultiPlayerSync()
SaveGame(2)
SmallWait(2)
StartMovie("ENDMOVIE")
SmallWait(2)
DisplayStringHead(Player1,0)
Wait(4)
FadeToColor([20.0],0)
DayNight(MIDNIGHT)
StartCutScene("X#DYDEAD")
END
>>>>>>>>
COPY + ~%patch_dir%/bcs/BG0125.bcs~ ~%patch_dir%/bcs~
DECOMPILE_AND_PATCH BEGIN
REPLACE_TEXTUALLY ~OR(4)[%newline%]*Global("X#DynaheirRomanceInactive","GLOBAL",1)[%newline%]*Global("X#DynaheirRomanceActive","GLOBAL",0)[%newline%]*Dead("dynaheir")[%newline%]*!InParty("dynaheir")~ ~~
//before replacing bcs block to change unknown string to dummy 0
REPLACE_TEXTUALLY ~DisplayStringHead(Player1,.*)[%newline%]*Wait(4)[%newline%]*FadeToColor(\[20\.0\],0)[%newline%]*DayNight(MIDNIGHT)[%newline%]*StartCutScene("X#DYDEAD")~ ~DisplayStringHead(Player1,0)
Wait(4)
FadeToColor([20.0],0)
DayNight(MIDNIGHT)
StartCutScene("X#DYDEAD")~
END
REPLACE_BCS_BLOCK ~.../EET/compat/bg1npc/baf/ar0125-rbOld.baf~ ~.../blank.baf~ ON_MISMATCH PATCH_WARN ~WARNING REPLACE_BCS_BLOCK: could not find block matching .../EET/compat/bg1npc/baf/ar0125-rbOld.baf in %SOURCE_FILE%.~ END
BUT_ONLY
<<<<<<<< .../EET/compat/bg1npc/baf/ar2700-rbOld.baf
IF
OR(2)
Global("X#DynaDeath","GLOBAL",6)
Global("endofbg1","GLOBAL",2)
THEN
RESPONSE #100
SetGlobal("endofbg1","GLOBAL",3)
StartMovie("ENDCRDIT")
EndCredits()
END
>>>>>>>>
COPY + ~%patch_dir%/bcs/BG2700.bcs~ ~%patch_dir%/bcs~
REPLACE_BCS_BLOCK ~.../EET/compat/bg1npc/baf/ar2700-rbOld.baf~ ~.../blank.baf~ ON_MISMATCH PATCH_WARN ~WARNING REPLACE_BCS_BLOCK: could not find block matching .../EET/compat/bg1npc/baf/ar2700-rbOld.baf in %SOURCE_FILE%.~ END
BUT_ONLY

//delete files existing in BG2:EE
DELETE + ~%patch_dir%/itm/brac25.itm~
~EET/temp/wav/IRENIC01.wav~
Expand Down
5 changes: 2 additions & 3 deletions EET/docs/BG1 reference table.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
function fnBuildFrameset()
{
var szHTML="<frameset rows=\"*,18\" border=0 width=0 frameborder=no framespacing=0>"+
"<frame src=\""+document.all.item("shLink")[3].href+"\" name=\"frSheet\" noresize>"+
"<frame src=\""+document.all.item("shLink")[0].href+"\" name=\"frSheet\" noresize>"+
"<frameset cols=\"54,*\" border=0 width=0 frameborder=no framespacing=0>"+
"<frame src=\"\" name=\"frScroll\" marginwidth=0 marginheight=0 scrolling=no>"+
"<frame src=\"\" name=\"frTabs\" marginwidth=0 marginheight=0 scrolling=no>"+
Expand Down Expand Up @@ -385,15 +385,14 @@
<x:WindowTopX>360</x:WindowTopX>
<x:WindowTopY>60</x:WindowTopY>
<x:TabRatio>940</x:TabRatio>
<x:ActiveSheet>3</x:ActiveSheet>
<x:ProtectStructure>False</x:ProtectStructure>
<x:ProtectWindows>False</x:ProtectWindows>
</x:ExcelWorkbook>
</xml><![endif]-->
</head>

<frameset rows="*,39" border=0 width=0 frameborder=no framespacing=0>
<frame src="BG1%20reference%20table_pliki/sheet004.html" name="frSheet">
<frame src="BG1%20reference%20table_pliki/sheet001.html" name="frSheet">
<frame src="BG1%20reference%20table_pliki/tabstrip.html" name="frTabs" marginwidth=0 marginheight=0>
<noframes>
<body>
Expand Down
37 changes: 34 additions & 3 deletions EET/docs/BG1 reference table_pliki/sheet003.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<html xmlns:o="urn:schemas-microsoft-com:office:office"
<html xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:x="urn:schemas-microsoft-com:office:excel"
xmlns="http://www.w3.org/TR/REC-html40">

Expand Down Expand Up @@ -63,11 +64,21 @@
<td>DORN_</td>
<td>________</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>DORND</td>
<td>DORND_</td>
<td>________</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>EDWIN</td>
<td>EDWIN_</td>
<td>BGEDWIN</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>EDWIND</td>
<td>EDWIND_</td>
<td>EDWIND</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>FALDORN</td>
<td>FALDORN_</td>
Expand Down Expand Up @@ -95,12 +106,12 @@
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>IMOEND</td>
<td>IMOEN2D</td>
<td>IMOEND_</td>
<td>IMOEN2D</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>JAHEID</td>
<td>JAHEIRAD</td>
<td>JAHEID</td>
<td>JAHEIRAD</td>
</tr>
<tr height=20 style='height:15.0pt'>
Expand All @@ -113,16 +124,31 @@
<td>MINSC_</td>
<td>BGMINSC</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>MINSCD</td>
<td>MINSCD_</td>
<td>MINSCD</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>NEERA</td>
<td>NEERA_</td>
<td>________</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>NEERAD</td>
<td>NEERAD_</td>
<td>________</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>RASAAD</td>
<td>RASAAD_</td>
<td>________</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>RASAADD</td>
<td>RASAADD_</td>
<td>________</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>SAREVOK</td>
<td>SAREVOK_</td>
Expand All @@ -148,6 +174,11 @@
<td>VICONIA_</td>
<td>BGVICNIA</td>
</tr>
<tr height=20 style='height:15.0pt'>
<td height=20 style='height:15.0pt'>VICOND</td>
<td>VICOND_</td>
<td>VICOND</td>
</tr>
<![if supportMisalignedColumns]>
<tr height=0 style='display:none'>
<td width=72 style='width:54pt'></td>
Expand Down
Loading

0 comments on commit 6e05754

Please sign in to comment.