diff --git a/EET/EET.tp2 b/EET/EET.tp2
index 7dadea37..9f5ec874 100644
--- a/EET/EET.tp2
+++ b/EET/EET.tp2
@@ -1,6 +1,6 @@
BACKUP ~EET/backup~
AUTHOR ~K4thos (swit)~
-VERSION ~1.0 RC7~
+VERSION ~1.0 RC8~
README ~EET/lang/%LANGUAGE%/readme-EET.html~ ~EET/readme-EET.html~
LANGUAGE ~English~
@@ -66,6 +66,13 @@ END
OUTER_SPRINT quote ~"~
OUTER_SPRINT tilde "~"
+ACTION_IF (DIRECTORY_EXISTS ~EET/temp~) BEGIN //just in case "d" flag was set during installation
+ ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
+ AT_NOW ~rmdir /s /q EET\temp~ EXACT
+ END ELSE BEGIN //osx, unix
+ AT_EXIT ~rm -rf EET/temp~ EXACT
+ END
+END
MKDIR ~EET/temp~
INCLUDE ~EET/lib/bgee_dir.tph~
diff --git a/EET/base/gui/MOS4000.PVRZ b/EET/base/gui/MOS4000.PVRZ
index d3105d20..6c80d52a 100644
Binary files a/EET/base/gui/MOS4000.PVRZ and b/EET/base/gui/MOS4000.PVRZ differ
diff --git a/EET/bin/win32/mtee.exe b/EET/bin/win32/mtee.exe
deleted file mode 100644
index 4a595772..00000000
Binary files a/EET/bin/win32/mtee.exe and /dev/null differ
diff --git a/EET/bin/win32/wtee.exe b/EET/bin/win32/wtee.exe
new file mode 100644
index 00000000..9e1dbd86
Binary files /dev/null and b/EET/bin/win32/wtee.exe differ
diff --git a/EET/compile/baf/K#TELBGT.baf b/EET/compile/baf/K#TELBGT.baf
index 13d4e001..f88e063e 100644
--- a/EET/compile/baf/K#TELBGT.baf
+++ b/EET/compile/baf/K#TELBGT.baf
@@ -2,6 +2,12 @@ IF
Global("K#FrameDelay","LOCALS",0)
THEN
RESPONSE #100
+ DisableAI(Player1,FALSE)
+ DisableAI(Player2,FALSE)
+ DisableAI(Player3,FALSE)
+ DisableAI(Player4,FALSE)
+ DisableAI(Player5,FALSE)
+ DisableAI(Player6,FALSE)
SetGlobal("K#FrameDelay","LOCALS",1)
END
@@ -55,18 +61,6 @@ IF
THEN
RESPONSE #100
SetGlobal("K#FrameDelay","LOCALS",2)
- DisableAI(Player1,FALSE)
- DisableAI(Player2,FALSE)
- DisableAI(Player3,FALSE)
- DisableAI(Player4,FALSE)
- DisableAI(Player5,FALSE)
- DisableAI(Player6,FALSE)
- ApplySpellRES("K#REST",Player1) // No such index
- ApplySpellRES("K#REST",Player2) // No such index
- ApplySpellRES("K#REST",Player3) // No such index
- ApplySpellRES("K#REST",Player4) // No such index
- ApplySpellRES("K#REST",Player5) // No such index
- ApplySpellRES("K#REST",Player6) // No such index
SetGlobal("K#temp","GLOBAL",29)
AdvanceTime(ONE_MONTH)
AddGlobals("K#DaysPassed","K#temp")
diff --git a/EET/lang/pl_PL/readme-EET.html b/EET/lang/pl_PL/readme-EET.html
index 429e903e..33e74c76 100644
--- a/EET/lang/pl_PL/readme-EET.html
+++ b/EET/lang/pl_PL/readme-EET.html
@@ -156,9 +156,9 @@ Baldur's Gate: Enhanced Edition Trilogy (EET)
Autor: K4thos
Kontrybutorzy na GitHub: WhiteAgnus, AWizardDidIt, Crevs Daak
W sieci: Strona i Forum dyskusyjne
- Wersja 1.0 Release Candidate 7
+
Wersja 1.0 Release Candidate 8
Dostępne wersje językowe: Angielski, Polski, Hiszpański, Niemiecki, Francuski
- Wsparcie dla systemów operacyjnych: Windows, Mac OS X
+ Wsparcie dla systemów operacyjnych: Windows, Mac OS X, Linux (partycja ignorująca wielkość liter)
@@ -222,6 +222,8 @@ Instalacja
Planując większe instalacje z modami warto rozważyć użycie programu Big World Setup (wsparcie dla EET zostanie dodane wkrótce). Narzędzie to pobierze, rozpakuje i zainstaluje wybrane modyfikacje razem z EET. Oszczędność czasu i frustracji związanych z doborem kolejności instalacji i kompatybilnością modów.
+
+
Wsparcie dla linuxa jst niepełne i obecnie wymaga skorzystania z partycji ignorującej wielkość liter. W przyszłości zostanie dodane wsparcie natywne.
Inicjacja instalacji EET (setup-EET + setup-EET_core)
@@ -519,7 +521,7 @@ Podziękowania (w kolejności alfabetycznej)
Beamdog za wersje Enhanced Editions gier na silniku Infinity Engine
Bioware i Black Isle za stworzenie gier z serii Baldur's Gate
Children of Bhaal (polskie forum BG) za hosting i wsparcie
- Corvias za ikonę skrótu do EET
+ Corvias za ikonę skrótu do EET i testowanie na systemie linux
Crevs Daak za kod dla komputerów MAC (kontrybucje na GitHubie)
Fouinto za testowanie wersji beta
geminibruni za czcionki użyte w GUI
diff --git a/EET/lib/EET_core.tp2 b/EET/lib/EET_core.tp2
index 5d863381..b67a9e7b 100644
--- a/EET/lib/EET_core.tp2
+++ b/EET/lib/EET_core.tp2
@@ -1,6 +1,6 @@
BACKUP ~EET/backup/core~
AUTHOR ~K4thos (swit)~
-VERSION ~1.0 RC7~
+VERSION ~1.0 RC8~
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
@@ -116,8 +116,8 @@ ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
OUTER_SPRINT exe ~.exe~
OUTER_SPRINT bin ~~
OUTER_SPRINT WEIDU_EXECUTABLE ~setup-EET.exe~
- OUTER_SPRINT bash_debug ~ | EET\bin\win32\mtee.exe /+ EET\temp\bash.debug~
- AT_UNINSTALL ~rmdir /s /q EET\temp~ EXACT
+ OUTER_SPRINT bash_debug ~ | EET\bin\win32\wtee.exe -a 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
END
@@ -138,7 +138,7 @@ END ELSE BEGIN //osx, unix
OUTER_SPRINT bin ~./~
OUTER_SPRINT WEIDU_EXECUTABLE ~./EET/weidu_%WEIDU_OS%~
OUTER_SPRINT bash_debug ~ 2>>EET/temp/bash.debug | tee -a EET/temp/bash.debug~
- AT_UNINSTALL ~rm -rf EET/temp~ EXACT
+ //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
@@ -1110,22 +1110,23 @@ END
PRINT ~~
PRINT ~LUA conversion...~
+MKDIR ~%patch_dir%/baf~
+ ~%patch_dir%/d~
+
//generate LUA tables and decompile files
OUTER_SPRINT tbl_lua ~filelist = {}%LNL%~
ACTION_BASH_FOR ~%patch_dir%/bcs~ ~.*~ BEGIN
- MOVE + ~%BASH_FOR_FILESPEC%~ ~%BASH_FOR_DIRECTORY%/%BASH_FOR_RES%.BAF~
- COPY + ~%BASH_FOR_DIRECTORY%/%BASH_FOR_RES%.BAF~ ~%BASH_FOR_DIRECTORY%/%BASH_FOR_RES%.BAF~
+ COPY + ~%BASH_FOR_FILESPEC%~ ~%patch_dir%/baf/%BASH_FOR_RES%.baf~
DECOMPILE_BCS_TO_BAF
- OUTER_SPRINT tbl_lua ~%tbl_lua%filelist[#filelist+1] = '%BASH_FOR_DIRECTORY%/%BASH_FOR_RES%.BAF'%LNL%~
+ SPRINT tbl_lua ~%tbl_lua%filelist[#filelist+1] = '%patch_dir%/baf/%BASH_FOR_RES%.baf'%LNL%~
END
ACTION_BASH_FOR ~%patch_dir%/dlg~ ~.*~ BEGIN
- MOVE + ~%BASH_FOR_FILESPEC%~ ~%BASH_FOR_DIRECTORY%/%BASH_FOR_RES%.D~
- COPY + ~%BASH_FOR_DIRECTORY%/%BASH_FOR_RES%.D~ ~%BASH_FOR_DIRECTORY%/%BASH_FOR_RES%.D~
+ COPY + ~%BASH_FOR_FILESPEC%~ ~%patch_dir%/d/%BASH_FOR_RES%.d~
DECOMPILE_DLG_TO_D
//REPLACE_TEXTUALLY ~EET/TEMP/PATCH/DLG/~ ~~ //moved into main.lua
- OUTER_SPRINT tbl_lua ~%tbl_lua%filelist[#filelist+1] = '%BASH_FOR_DIRECTORY%/%BASH_FOR_RES%.D'%LNL%~
+ SPRINT tbl_lua ~%tbl_lua%filelist[#filelist+1] = '%patch_dir%/d/%BASH_FOR_RES%.d'%LNL%~
END
ACTION_FOR_EACH var IN mus sum state ipro kit race class spec chapter save dv var 2da are bam bcs bmp cre dlg eff itm mos mve pro spl splRes splName sto tis vef wav door exit tra wmp BEGIN
@@ -1443,8 +1444,8 @@ COPY ~%patch_dir%/are~ ~override~
LPF EET_expand_tlk INT_VAR add = 200000 END
// Area script assigner
READ_ASCII 0x94 "script"
- PATCH_IF (FILE_EXISTS ~%patch_dir%/bcs/%script%.baf~) BEGIN
- END ELSE PATCH_IF (FILE_EXISTS ~%patch_dir%/bcs/%SOURCE_RES%.baf~) BEGIN
+ PATCH_IF (FILE_EXISTS ~%patch_dir%/baf/%script%.baf~) BEGIN
+ END ELSE PATCH_IF (FILE_EXISTS ~%patch_dir%/baf/%SOURCE_RES%.baf~) BEGIN
PATCH_PRINT ~%SOURCE_FILE% - Area script (%SOURCE_RES%.BCS) assigned~
WRITE_ASCIIE 0x94 ~%SOURCE_RES%~ #8
END ELSE PATCH_IF (~%script%~ STR_CMP ~~) AND (NOT ~%script%~ STR_EQ ~NONE~) BEGIN
@@ -1509,7 +1510,7 @@ COPY_LARGE + ~EET/base/bam~ ~%biff_dir%~
PRINT ~Installing BCS files...~
//compile scripts
-COMPILE ~%patch_dir%/bcs~
+COMPILE ~%patch_dir%/baf~
~EET/compile/baf~
//patching BG:EE scripts
@@ -1579,7 +1580,7 @@ END
PRINT ~Installing DLG files...~
-COPY + ~%patch_dir%/dlg/BPNAJIM.D~ ~%patch_dir%/dlg~
+COPY + ~%patch_dir%/d/BPNAJIM.d~ ~%patch_dir%/d~
REPLACE_TEXTUALLY ~IncrementChapter("BPEND")[%newline%]*GoToStartScreen()~ ~ClearAllActions()
ReallyForceSpellRES("K#FAMREM",Player1)
ReallyForceSpellRES("K#FAMREM",Player2)
@@ -1590,7 +1591,7 @@ COPY + ~%patch_dir%/dlg/BPNAJIM.D~ ~%patch_dir%/dlg~
StartCutScene("K#CUTBP2")~
BUT_ONLY
-COMPILE ~%patch_dir%/dlg~
+COMPILE ~%patch_dir%/d~
~EET/compile/d~
///// \\\\\
diff --git a/EET/lib/bg1_BCS.tph b/EET/lib/bg1_BCS.tph
index 6e2e6111..6a2b2fd0 100644
--- a/EET/lib/bg1_BCS.tph
+++ b/EET/lib/bg1_BCS.tph
@@ -827,6 +827,20 @@ COPY_EXISTING ~BD6100.BCS~ ~override~
END ELSE BEGIN
PATCH_WARN ~WARNING: could not find %textToReplace% in %SOURCE_FILESPEC%~
END
+ SPRINT textToReplace ~\(ActionOverride(Player6,SetSequence(SEQ_SLEEP))\)~
+ COUNT_REGEXP_INSTANCES ~%textToReplace%~ num_matches
+ PATCH_IF (num_matches > 0) BEGIN
+ REPLACE_TEXTUALLY ~%textToReplace%~ ~\1
+ ApplySpellRES("K#REST",Player1) // No such index
+ ApplySpellRES("K#REST",Player2) // No such index
+ ApplySpellRES("K#REST",Player3) // No such index
+ ApplySpellRES("K#REST",Player4) // No such index
+ ApplySpellRES("K#REST",Player5) // No such index
+ ApplySpellRES("K#REST",Player6) // No such index~
+ 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
diff --git a/EET/lib/main.lua b/EET/lib/main.lua
index 14362788..0835dc39 100644
--- a/EET/lib/main.lua
+++ b/EET/lib/main.lua
@@ -32,7 +32,7 @@ for i=1, #filelist do
file = io.open(SOURCE_FILESPEC,"r")
str = file:read("*all")
file:close()
- if SOURCE_FILESPEC:match('%.D$') then
+ if SOURCE_FILESPEC:match('%.[Dd]$') then
str = str:gsub('EET/TEMP/PATCH/DLG/', '')
--D_traifyDLG_replace
str = str:gsub('(SAY #)([0-9]+)', function(m1, m2) return D_traifyDLG_replace(m1, m2) end)
diff --git a/EET/lib/transition.tph b/EET/lib/transition.tph
index 658b0e94..356828a4 100644
--- a/EET/lib/transition.tph
+++ b/EET/lib/transition.tph
@@ -540,13 +540,25 @@ END
///// SharTeel \\\\\
///// \\\\\
-LAF ~EET_NPC_TRANSITION~
- INT_VAR
- type = 1
- STR_VAR
- dv = "SharTeel"
- override_BG1 = "SHARTEEL"
- string = "@1000015"
+ACTION_IF (FILE_EXISTS ~WeiDU-BGEE.log~) AND (FILE_CONTAINS ~WeiDU-BGEE.log~ ~K9SHARTEELNPC\.TP2~) BEGIN
+ LAF ~EET_NPC_TRANSITION~
+ INT_VAR
+ type = 1
+ STR_VAR
+ dv = "SharTeel"
+ override_BG1 = "SHARTEEL"
+ override_SoD = "K9SHAR"
+ string = "@1000015"
+ END
+END ELSE BEGIN
+ LAF ~EET_NPC_TRANSITION~
+ INT_VAR
+ type = 1
+ STR_VAR
+ dv = "SharTeel"
+ override_BG1 = "SHARTEEL"
+ string = "@1000015"
+ END
END
///// \\\\\
diff --git a/EET/readme-EET.html b/EET/readme-EET.html
index 8353c8c4..21950c09 100644
--- a/EET/readme-EET.html
+++ b/EET/readme-EET.html
@@ -13,9 +13,9 @@ Baldur's Gate: Enhanced Edition Trilogy (EET)
Author: K4thos
Contributors: WhiteAgnus, AWizardDidIt, CrevsDaak
On the web: Home page and discussion forum
- Version 1.0 Release Candidate 7
+
Version 1.0 Release Candidate 8
Languages: English, Polish, Spanish, German (unfinished), French (unfinished)
- Platforms: Windows, Mac OS X (needs testing)
+ Platforms: Windows, Mac OS X, Linux (case insensitive partitions)
@@ -79,6 +79,8 @@ Installation
If you are planning to use other mods than you should consider using Big World Setup (support for EET will added to BWS soon) to download, extract and install EET and other mods. This approach will save you a lot of time and ensure that selected mods are compatible with EET and installed in the correct order.
+
+
Linux support is experimental and currently works only on case insensitive partitions. In future EET will be adopted to support case sensitive system natively.
Initialise EET (setup-EET + setup-EET_core)
@@ -377,7 +379,7 @@ Kudos (in alphabetical order)
Many thanks to Beamdog for creating Enhanced Editions of Infinity Engine games
Many thanks to Bioware and Black Isle Studios for creating Baldur's Gate series
Many thanks to Children of Bhaal forum for hosting and support
- Many thanks to Corvias for EET icon
+ Many thanks to Corvias for EET icon and linux support testing
Many thanks to Crevs Daak for GitHub contributions to the project
Many thanks to Fouinto for beta testing
Many thanks to geminibruni for title fonts
diff --git a/EET/tbl/compatibility.tbl b/EET/tbl/compatibility.tbl
index 9f493b8d..ef1c8ebe 100644
--- a/EET/tbl/compatibility.tbl
+++ b/EET/tbl/compatibility.tbl
@@ -16,7 +16,7 @@ BG1NPC 1 //The BG1 NPC Project
BG1NPCMUSIC 0 //The BG1 NPC Project Music Pack
INDINPC 0 //The Indira NPC for BG1 Tutu
MUR'NETH 1 //The Mur'Neth NPC mod for Baldur's Gate Tutu or Baldur's Gate Trilogy-WeiDU
-Murnethstringfixer 0 //(German) Mur'Neth String Fixer
+MURNETHSTRINGFIXER 0 //(German) Mur'Neth String Fixer
XANBG1FRIEND 0 //Xan's friendship path for BG1
CORANBGFRIEND 0 //Coran's BG Extended Friendship Talks for Tutu, BGT, and BGEE
AJANTISBG1 0 //Ajantis BG1 expansion
@@ -30,6 +30,7 @@ GARRICK-TT 1 //Garrick : Tales of a troubadour
VYND 1 //Vynd for BGTutu, BGT and BG:EE
BG1RE 1 //Baldur's Gate Romantic Encounters Modification
SIRENE 1 //Sirene NPC for BG:EE
+K9SHARTEELNPC 0 //Sharteel NPC mod for SoD
TENYATHERMIDOR 0 //Tenya Thermidor for BG:EE
MARGARITA 0 //Margarita for Baldur's Gate: Enhanced Edition
NEERA 0 //Neera Expansion