Version 1.0 Release Candidate 6.3

- fixed (hopefully) Mac OSX support
- fixed WeiDU-BGEE.log importation
- fixed BG1 NPC Project compatibility patch
- fixed SoA transition when party has many items in inventory
- no messages regarding Khalid and Dynaheir death
- Imoen present in cutscenes now uses colors and animation assigned to
real Imoen

EET/EET.tp2

@@ -55,10 +55,12 @@ BUT_ONLY
 
 ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
  OUTER_SPRINT exe ~.exe~
+ OUTER_SPRINT osxBin ~~
  OUTER_SPRINT WEIDU_EXECUTABLE ~setup-EET.exe~
 END ELSE ACTION_IF ~%WEIDU_OS%~ STR_EQ ~osx~ BEGIN
  OUTER_SPRINT exe ~~
- OUTER_SPRINT WEIDU_EXECUTABLE ~setup-EET~
+ OUTER_SPRINT osxBin ~./~
+ OUTER_SPRINT WEIDU_EXECUTABLE ~./setup-EET~
 END
 
 OUTER_SPRINT quote ~"~
@@ -170,4 +172,4 @@ END ELSE ACTION_IF ~%LANGUAGE%~ STR_EQ ~fr_FR~ BEGIN
 END ELSE ACTION_IF ~%LANGUAGE%~ STR_EQ ~es_ES~ BEGIN
  OUTER_SET langVar = 4
 END
-AT_EXIT ~setup-EET_core%exe% --force-install 0 --language %langVar% --skip-at-view --use-lang "%LANGUAGE_BG2%" --args-list %argv[0]% "%bgee_dir%"~
+AT_EXIT ~%osxBin%setup-EET_core%exe% --force-install 0 --language %langVar% --skip-at-view --use-lang "%LANGUAGE_BG2%" --args-list %argv[0]% "%bgee_dir%"~

EET/base/lua/M_EET.LUA

@@ -124,13 +124,13 @@ end
 
 --obviously theres some redundancy in this data but I dislike the idea of assuming what our frame/sequence will be.
 startCampaignData = {
- {name = 'EET_CMP_TITLE_BG1', description = 'EET_CMP_TEXT_BG1', title = 0, bigLogo = 0, icon = 0, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --bg1
- {name = 'EET_CMP_TITLE_SOD', description = 'EET_CMP_TEXT_SOD', title = 1, bigLogo = 1, icon = 1, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --sod
- {name = 'EET_CMP_TITLE_SOA', description = 'EET_CMP_TEXT_SOA', title = 2, bigLogo = 2, icon = 2, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --soa
- {name = 'EET_CMP_TITLE_TOB', description = 'EET_CMP_TEXT_TOB', title = 3, bigLogo = 3, icon = 3, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --tob
- {name = 'EET_CMP_TITLE_BP1', description = 'EET_CMP_TEXT_BP1', title = 4, bigLogo = 4, icon = 4, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --bp1
- {name = 'EET_CMP_TITLE_BP2', description = 'EET_CMP_TEXT_BP2', title = 5, bigLogo = 5, icon = 5, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --bp2
- {name = 'EET_CMP_TITLE_TUT', description = 'EET_CMP_TEXT_TUT', title = 6, bigLogo = 6, icon = 6, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --tut
+ {name = 'EET_CMP_TITLE_BG1', description = 'EET_CMP_TEXT_BG1', title = 0, bigLogo = 0, icon = 0, background = 2, button = 2, sidebar = 2, importEnabled = false, tutorialEnabled = false}, --bg1
+ {name = 'EET_CMP_TITLE_SOD', description = 'EET_CMP_TEXT_SOD', title = 1, bigLogo = 1, icon = 1, background = 2, button = 2, sidebar = 2, importEnabled = false, tutorialEnabled = false}, --sod
+ {name = 'EET_CMP_TITLE_SOA', description = 'EET_CMP_TEXT_SOA', title = 2, bigLogo = 2, icon = 2, background = 2, button = 2, sidebar = 2, importEnabled = false, tutorialEnabled = false}, --soa
+ {name = 'EET_CMP_TITLE_TOB', description = 'EET_CMP_TEXT_TOB', title = 3, bigLogo = 3, icon = 3, background = 2, button = 2, sidebar = 2, importEnabled = false, tutorialEnabled = false}, --tob
+ {name = 'EET_CMP_TITLE_BP1', description = 'EET_CMP_TEXT_BP1', title = 4, bigLogo = 4, icon = 4, background = 2, button = 2, sidebar = 2, importEnabled = false, tutorialEnabled = false}, --bp1
+ {name = 'EET_CMP_TITLE_BP2', description = 'EET_CMP_TEXT_BP2', title = 5, bigLogo = 5, icon = 5, background = 2, button = 2, sidebar = 2, importEnabled = false, tutorialEnabled = false}, --bp2
+ {name = 'EET_CMP_TITLE_TUT', description = 'EET_CMP_TEXT_TUT', title = 6, bigLogo = 6, icon = 6, background = 2, button = 2, sidebar = 2, importEnabled = false, tutorialEnabled = false}, --tut
 }
 
 -- class, kit, clastxtBIO: BG1, SOD, SOA, TOB, BP1, BP2, TUT, (...)

EET/base/lua/UI_BG2.MENU

@@ -7120,6 +7120,7 @@ menu
  button
  {
  bam 'STARTMBT'
+ enabled "getCampaignImportEnabled()"
  sequence 4
  area 680 375 233 84
  pad 10 8 10 8

EET/compat/bg1npc/include.tph

@@ -1,8 +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~
+ //conflict with BG2:EE resources
+ ACTION_DEFINE_ASSOCIATIVE_ARRAY remapped_dlg BEGIN
+ "PLAYER1" => "PLAYER1_"
+ END
+ MOVE + ~%patch_dir%/dlg/PLAYER1.DLG~ ~%patch_dir%/dlg/PLAYER1_.DLG~
 END
 
 //Compatibility with BG1NPC Banters, Quests, and Interjections

EET/compat/bg1npc/list.txt

@@ -21,7 +21,7 @@ Incompatibility BG2: minhp20.itm //direct copy of BG2:EE file, so no needed
 Incompatibility BG2: misc3m.itm //direct copy of BG2:EE file, so no needed
 Incompatibility BG2: misc3n.itm //direct copy of BG2:EE file, so no needed
 Incompatibility BG2: misc3o.itm //direct copy of BG2:EE file, so no needed
-Incompatibility BG2: PLAYER1.dlg //empty file, CHARNAME already has dialogue file assigned in BG2:EE
+Incompatibility BG2: PLAYER1.dlg //renamed due to conflict with BG2:EE
 Incompatibility BG2: plot05d.itm //no need for it, like in BGT use the BG2:EE version instead
 Incompatibility BG2: sahbolt.itm //direct copy of BG2:EE file, so no needed
 Incompatibility BG2: sarevoks.bmp //no need for it, like in BGT use the BG2:EE version instead

EET/compile/baf/K#TELBGT.baf

@@ -3,6 +3,58 @@ IF
 THEN
  RESPONSE #100
  SetGlobal("K#FrameDelay","LOCALS",1)
+END
+
+IF
+ Global("K#FrameDelay","LOCALS",1)
+ !Name("None",Player2)
+THEN
+ RESPONSE #100
+ ActionOverride(Player2,MakeUnselectable(1))
+ Continue()
+END
+
+IF
+ Global("K#FrameDelay","LOCALS",1)
+ !Name("None",Player3)
+THEN
+ RESPONSE #100
+ ActionOverride(Player3,MakeUnselectable(1))
+ Continue()
+END
+
+IF
+ Global("K#FrameDelay","LOCALS",1)
+ !Name("None",Player4)
+THEN
+ RESPONSE #100
+ ActionOverride(Player4,MakeUnselectable(1))
+ Continue()
+END
+
+IF
+ Global("K#FrameDelay","LOCALS",1)
+ !Name("None",Player5)
+THEN
+ RESPONSE #100
+ ActionOverride(Player5,MakeUnselectable(1))
+ Continue()
+END
+
+IF
+ Global("K#FrameDelay","LOCALS",1)
+ !Name("None",Player6)
+THEN
+ RESPONSE #100
+ ActionOverride(Player6,MakeUnselectable(1))
+ Continue()
+END
+
+IF
+ Global("K#FrameDelay","LOCALS",1)
+THEN
+ RESPONSE #100
+ SetGlobal("K#FrameDelay","LOCALS",2)
  DisableAI(Player1,FALSE)
  DisableAI(Player2,FALSE)
  DisableAI(Player3,FALSE)
@@ -15,11 +67,6 @@ THEN
  ApplySpellRES("K#REST",Player4) // No such index
  ApplySpellRES("K#REST",Player5) // No such index
  ApplySpellRES("K#REST",Player6) // No such index
- ActionOverride(Player2,MakeUnselectable(1))
- ActionOverride(Player3,MakeUnselectable(1))
- ActionOverride(Player4,MakeUnselectable(1))
- ActionOverride(Player5,MakeUnselectable(1))
- ActionOverride(Player6,MakeUnselectable(1))
  SetGlobal("K#temp","GLOBAL",29)
  AdvanceTime(ONE_MONTH)
  AddGlobals("K#DaysPassed","K#temp")
@@ -32,10 +79,10 @@ THEN
 END
 
 IF
- Global("K#FrameDelay","LOCALS",1)
+ Global("K#FrameDelay","LOCALS",2)
 THEN
  RESPONSE #100
- SetGlobal("K#FrameDelay","LOCALS",2)
+ SetGlobal("K#FrameDelay","LOCALS",3)
  ApplySpellRES("K#UNREST",Player1) // No such index
  ApplySpellRES("K#UNREST",Player2) // No such index
  ApplySpellRES("K#UNREST",Player3) // No such index

EET/lang/de_DE/setup.tra

@@ -6,9 +6,9 @@
 @900002 = ~EET should be installed BEFORE BP-BGT Worldmap~
 @900003 = ~Detected BG:EE directory as %bgee_dir%.
 Is this correct? [Y]es or [N]o~
-@900004 = ~Enter the full path to your BG:EE installation then press Enter.
+@900004 = ~Enter the full path to your BG:EE+SoD installation then press Enter.
 Example: C:\Program Files (x86)\BeamDog\Games\00806~
-@900005 = ~Invalid BG:EE directory, or incorrect BG:EE installation.
+@900005 = ~Invalid directory, or incorrect BG:EE+SoD installation.
 It is safe to abort this installation by closing this window or pressing Ctrl+C.~
 @900006 = ~You've installed wrong The Stone of Askavar component. EET is compatible with Default version (option 1 during installation).~
 @900007 = ~You've installed wrong Drizzt Saga component. EET is compatible with Default version (option 1 during installation).~

EET/lang/en_US/setup.tra

@@ -6,9 +6,9 @@
 @900002 = ~EET should be installed BEFORE BP-BGT Worldmap~
 @900003 = ~Detected BG:EE directory as %bgee_dir%.
 Is this correct? [Y]es or [N]o~
-@900004 = ~Enter the full path to your BG:EE installation then press Enter.
+@900004 = ~Enter the full path to your BG:EE+SoD installation then press Enter.
 Example: C:\Program Files (x86)\BeamDog\Games\00806~
-@900005 = ~Invalid BG:EE directory, or incorrect BG:EE installation.
+@900005 = ~Invalid directory, or incorrect BG:EE+SoD installation.
 It is safe to abort this installation by closing this window or pressing Ctrl+C.~
 @900006 = ~You've installed wrong The Stone of Askavar component. EET is compatible with Default version (option 1 during installation).~
 @900007 = ~You've installed wrong Drizzt Saga component. EET is compatible with Default version (option 1 during installation).~

EET/lang/es_ES/setup.tra

@@ -6,9 +6,9 @@
 @900002 = ~EET should be installed BEFORE BP-BGT Worldmap~
 @900003 = ~Detected BG:EE directory as %bgee_dir%.
 Is this correct? [Y]es or [N]o~
-@900004 = ~Enter the full path to your BG:EE installation then press Enter.
+@900004 = ~Enter the full path to your BG:EE+SoD installation then press Enter.
 Example: C:\Program Files (x86)\BeamDog\Games\00806~
-@900005 = ~Invalid BG:EE directory, or incorrect BG:EE installation.
+@900005 = ~Invalid directory, or incorrect BG:EE+SoD installation.
 It is safe to abort this installation by closing this window or pressing Ctrl+C.~
 @900006 = ~You've installed wrong The Stone of Askavar component. EET is compatible with Default version (option 1 during installation).~
 @900007 = ~You've installed wrong Drizzt Saga component. EET is compatible with Default version (option 1 during installation).~

EET/lang/fr_FR/setup.tra

@@ -6,9 +6,9 @@
 @900002 = ~EET should be installed BEFORE BP-BGT Worldmap~
 @900003 = ~Detected BG:EE directory as %bgee_dir%.
 Is this correct? [Y]es or [N]o~
-@900004 = ~Enter the full path to your BG:EE installation then press Enter.
+@900004 = ~Enter the full path to your BG:EE+SoD installation then press Enter.
 Example: C:\Program Files (x86)\BeamDog\Games\00806~
-@900005 = ~Invalid BG:EE directory, or incorrect BG:EE installation.
+@900005 = ~Invalid directory, or incorrect BG:EE+SoD installation.
 It is safe to abort this installation by closing this window or pressing Ctrl+C.~
 @900006 = ~You've installed wrong The Stone of Askavar component. EET is compatible with Default version (option 1 during installation).~
 @900007 = ~You've installed wrong Drizzt Saga component. EET is compatible with Default version (option 1 during installation).~

EET/lang/pl_PL/setup.tra

@@ -6,9 +6,9 @@
 @900002 = ~Mod BP-BGT Worldmap powinien byc zainstalowany po EET~
 @900003 = ~Wykryto instalacje BG:EE w folderze %bgee_dir%.
 Czy to o nia chodzi? [Y] tak, [N] nie~
-@900004 = ~Wpisz pelna sciezke do instalacji BG:EE i potwierdz ja klawiszem Enter.
+@900004 = ~Wpisz pelna sciezke do instalacji BG:EE+SoD i potwierdz ja klawiszem Enter.
 Przyklad: C:\Program Files (x86)\BeamDog\Games\00806~
-@900005 = ~Nieprawidlowa sciezka, lub problem z instalacja BG:EE.
+@900005 = ~Nieprawidlowa sciezka, lub problem z instalacja BG:EE+SoD.
 W razie dalszych problemow mozna zamknac to okno i zakonczyc instalacje skrotem Ctrl+C.~
 @900006 = ~Wykryto nieprawidlowy komponent modu The Stone of Askavar. EET posiada wsparcie dla wersji Default (pierwsza opcja podczas instalacji).~
 @900007 = ~Wykryto nieprawidlowy komponent modu Drizzt Saga. EET posiada wsparcie dla wersji Default (pierwsza opcja podczas instalacji).~

EET/lib/EET_core.tp2

@@ -108,8 +108,9 @@ OUTER_SPRINT log_remapped_splName ~~
 ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
  OUTER_SPRINT os_slash ~\~
  OUTER_SPRINT exe ~.exe~
+ OUTER_SPRINT osxBin ~~
  OUTER_SPRINT WEIDU_EXECUTABLE ~setup-EET.exe~
- OUTER_SPRINT bash_debug ~ 2>&1|EET\bin\win32\mtee.exe EET\temp\bash.debug /A~
+ OUTER_SPRINT bash_debug ~ 2>&1|EET\bin\win32\mtee.exe EET\temp\bash.debug~
  AT_UNINSTALL ~rmdir /s /q EET\temp~ EXACT
  ACTION_IF (~%argv[0]%~ STRING_CONTAINS_REGEXP ~[dD]~ = 1) BEGIN
  //AT_EXIT ~rmdir /s /q EET\temp~ EXACT
@@ -129,28 +130,20 @@ ECHO %arch_var%>EET\temp\arch_var.txt
 END ELSE ACTION_IF ~%WEIDU_OS%~ STR_EQ ~osx~ BEGIN
  OUTER_SPRINT os_slash ~/~
  OUTER_SPRINT exe ~~
- OUTER_SPRINT WEIDU_EXECUTABLE ~setup-EET~
+ OUTER_SPRINT osxBin ~./~
+ OUTER_SPRINT WEIDU_EXECUTABLE ~./setup-EET~
  OUTER_SPRINT bash_debug ~ 2>>EET/temp/bash.debug | tee -a EET/temp/bash.debug~
  AT_UNINSTALL ~rm -rf EET/temp~ EXACT
  ACTION_IF (~%argv[0]%~ STRING_CONTAINS_REGEXP ~[dD]~ = 1) BEGIN
  AT_EXIT ~rm -rf EET/temp~ EXACT
  END
 END
 
-OUTER_SPRINT tileconv ~EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%tileconv%exe%~
-OUTER_SPRINT tile2ee ~EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%tile2ee%exe%~
-OUTER_SPRINT ffmpeg ~EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%ffmpeg%exe%~
+OUTER_SPRINT tileconv ~%osxBin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%tileconv%exe%~
+OUTER_SPRINT tile2ee ~%osxBin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%tile2ee%exe%~
+OUTER_SPRINT ffmpeg ~%osxBin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%ffmpeg%exe%~
 OUTER_SET EET_JOURNAL = 1
 
-ACTION_IF FILE_EXISTS ~%bgee_dir%/WeiDU.log~ BEGIN
- COPY ~%bgee_dir%/WeiDU.log~ ~WeiDU-BGEE.log~
- REPLACE_TEXTUALLY ~^//.*~ ~~ //removes "Recently uninstalled" lines
-END
-
-///// \\\\\
-///// Include \\\\\
-///// \\\\\
-
 COPY - ~EET/other/cpmvars/eet_cpmvars.tpa~ ~.../eet_cpmvars.tpa~
  ~EET/other/EET_functions.tph~ ~.../EET_functions.tph~
  REPLACE_TEXTUALLY ~\(GAME_IS .eet\)~ ~\1 bg2ee~ //at this point WeiDU thinks it's still BG2:EE installation, unless you're reinstalling the mod
@@ -162,6 +155,13 @@ INCLUDE ~EET/lib/strref_tables.tph~
 INCLUDE ~EET/lib/bgee_dir.tph~
 INCLUDE ~EET/lib/pcu_dict.tph~
 
+ACTION_IF FILE_EXISTS ~%bgee_dir%/WeiDU.log~ BEGIN
+ COPY ~%bgee_dir%/WeiDU.log~ ~WeiDU-BGEE.log~
+ REPLACE_TEXTUALLY ~^//.*[%newline%]*~ ~~ //removes "Recently uninstalled" lines
+END ELSE BEGIN
+ COPY ~.../blank.txt~ ~WeiDU-BGEE.log~
+END
+
 ///// \\\\\
 ///// BG2:EE files patching \\\\\
 ///// \\\\\
@@ -1791,6 +1791,7 @@ COPY ~EET/base/spl/SPWI123.SPL~ ~override~
  ~EET/base/spl/SPCL342.SPL~ ~override~
  ~EET/base/spl/K#FAMKIL.SPL~ ~override~
  ~EET/base/spl/K#FAMREM.SPL~ ~override~
+ ~EET/base/spl/K#FATIGP.SPL~ ~override~
  ~EET/base/spl/K#REST.SPL~ ~override~
  ~EET/base/spl/K#UNREST.SPL~ ~override~
 ACTION_FOR_EACH var IN 4 6 9 12 24 BEGIN

EET/lib/EET_end.tp2

@@ -706,7 +706,7 @@ ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
  AT_NOW ~del /f "%USER_DIRECTORY%\save\saves.tra"~ EXACT
  AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --traify-tlk --min %str_min% --out "%USER_DIRECTORY%\save\saves.tra"~
 END ELSE BEGIN
- OUTER_SPRINT WEIDU_EXECUTABLE ~setup-EET~
+ OUTER_SPRINT WEIDU_EXECUTABLE ~./setup-EET~
  AT_NOW ~rm -f %USER_DIRECTORY%/save/saves.tra~ EXACT
  AT_NOW ~%WEIDU_EXECUTABLE% --noautoupdate --no-auto-tp2 --traify-tlk --min %str_min% --out "%USER_DIRECTORY%/save/saves.tra"~
 END

EET/lib/bg1_BCS.tph

@@ -796,6 +796,34 @@ COPY_EXISTING ~BDCUT61.BCS~ ~override~
  END
 BUT_ONLY
 
+///// \\\\\
+///// Animation/color import for cutscene CRE files \\\\\
+///// \\\\\
+
+ACTION_DEFINE_ASSOCIATIVE_ARRAY table_sourceBase BEGIN
+ 1 , ~BDDDD2A~ , ~CreateCreature("BDCCIMO",[^)]+)~ , ~BDCCIMO~ => ~Imoen2~
+ 2 , ~BDDDD2B~ , ~CreateCreature("BDCCIMO",[^)]+)~ , ~BDCCIMO~ => ~Imoen2~
+ //3 , ~BD0103~ , ~CreateCreature("BDIMDEAD",[^)]+)~ , ~Imoen2~ => ~Imoen2~
+ //4 , ~BD0103~ , ~CreateCreature("BDIMOEN",[^)]+)~ , ~Imoen2~ => ~Imoen2~
+ //5 , ~BDSCRY01~ , ~CreateCreature("BDIMOEN",[^)]+)~ , ~Imoen2~ => ~Imoen2~
+END
+
+ACTION_PHP_EACH table_sourceBase AS source => base BEGIN
+ COPY_EXISTING ~%source_1%.BCS~ ~override~
+ DECOMPILE_AND_PATCH BEGIN
+ SPRINT textToReplace ~\(%source_2%\)~
+ COUNT_REGEXP_INSTANCES ~%textToReplace%~ num_matches
+ PATCH_IF (num_matches > 0) BEGIN
+ REPLACE_TEXTUALLY ~%textToReplace%~ ~\1
+ ActionOverride("%source_3%",PolymorphCopy("%base%"))~
+ PATCH_PRINT ~Patching: %num_matches% matches found in %SOURCE_FILESPEC% for REPLACE_TEXTUALLY: %textToReplace%~
+ END ELSE BEGIN
+ PATCH_WARN ~WARNING: could not find %textToReplace% in %SOURCE_FILESPEC%~
+ END
+ END
+ BUT_ONLY
+END
+
 ///// \\\\\
 ///// added by BG:EE \\\\\
 ///// \\\\\