Skip to content

Commit

Permalink
Version 1.0 Release Candidate 8
Browse files Browse the repository at this point in the history
- Updated readme to highlight Big World Setup and Big World Fixpack
support
- Fixed potential NPC death during SoD -> BG2 transition
- Fixed engine differences related to MakeUnselectable action (BG:EE
Romance fights, Dorn not attacking)
- Removed workaround for dealing with NPC death in Black Pits 1 - no
longer needed (again related to MakeUnselectable)
- Fixed (hopefully) "out of memory" errors when mod is installed in BWS
(via external pure LUA code BAF/D patching)
- Drastically reduced installation time with mods installed on BG:EE
(thanks to above mentioned external regexp patching)
- Fixed EET_modConverter SG, G, GGT, GLT chapter patching
- Fixed OSX support (via workaround for MAKE_BIFF chitin.key patching)
- Added partial linux support (requires setting up case insensitive
partitions for now)
http://forums.pocketplane.net/index.php/topic,29259.msg337801.html?PHPSESSID=3914f7c53c94fecb1371a79e2ae65d59#msg337801
- Tutorial title text in main menu (by Corvias)
- Support for Sharteel NPC mod for SoD
  • Loading branch information
K4thos committed Jan 19, 2017
1 parent 5eab19d commit a0f91b6
Show file tree
Hide file tree
Showing 12 changed files with 76 additions and 43 deletions.
9 changes: 8 additions & 1 deletion EET/EET.tp2
Original file line number Diff line number Diff line change
@@ -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~
Expand Down Expand Up @@ -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~
Expand Down
Binary file modified EET/base/gui/MOS4000.PVRZ
Binary file not shown.
Binary file removed EET/bin/win32/mtee.exe
Binary file not shown.
Binary file added EET/bin/win32/wtee.exe
Binary file not shown.
18 changes: 6 additions & 12 deletions EET/compile/baf/K#TELBGT.baf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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")
Expand Down
8 changes: 5 additions & 3 deletions EET/lang/pl_PL/readme-EET.html
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ <h1>Baldur's Gate: Enhanced Edition Trilogy (EET)</h1>
<strong>Autor</strong>: <a href="http://gibberlings3.net/forums/index.php?showuser=6804">K4thos</a><br>
<strong>Kontrybutorzy na GitHub</strong>: WhiteAgnus, AWizardDidIt, Crevs Daak</p>
<p><strong>W sieci: </strong><strong><a href="http://baldur.cob-bg.pl/">Strona</a></strong> i <a href="http://athkatla.cob-bg.pl/viewforum.php?f=190"><strong>Forum dyskusyjne</strong></a></p>
<p><strong>Wersja 1.0 <acronym title="(software development) A version of a program that is nearly ready for release but may still have a few bugs; the status between beta version and release version.">Release Candidate</acronym> 7</strong><br />
<p><strong>Wersja 1.0 <acronym title="(software development) A version of a program that is nearly ready for release but may still have a few bugs; the status between beta version and release version.">Release Candidate</acronym> 8</strong><br />
<strong>Dostępne wersje językowe: </strong>Angielski, Polski, Hiszpański, Niemiecki, Francuski<br />
<strong>Wsparcie dla systemów operacyjnych: </strong>Windows, Mac OS X</p>
<strong>Wsparcie dla systemów operacyjnych: </strong>Windows, Mac OS X, Linux (<a href="http://forums.pocketplane.net/index.php/topic,29259.msg337801.html#msg337801">partycja ignorująca wielkość liter</a>)</p>
</div>

<!-- ================== T a b l e ================== --><a id="table" name="Table of Contents"></a>
Expand Down Expand Up @@ -222,6 +222,8 @@ <h2>Instalacja</h2>

<div class="code">
<p>Planując większe instalacje z modami warto rozważyć użycie programu <a href="https://bitbucket.org/BigWorldSetup/">Big World Setup</a> (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.</p>

<p>Wsparcie dla linuxa jst niepełne i obecnie wymaga skorzystania z <a href="http://forums.pocketplane.net/index.php/topic,29259.msg337801.html#msg337801">partycji ignorującej wielkość liter</a>. W przyszłości zostanie dodane wsparcie natywne.</p>
</div>

<h3>Inicjacja instalacji EET (setup-EET + setup-EET_core)</h3>
Expand Down Expand Up @@ -519,7 +521,7 @@ <h3>Podziękowania (w kolejności alfabetycznej)</h3>
<li>Beamdog za wersje Enhanced Editions gier na silniku Infinity Engine</li>
<li>Bioware i Black Isle za stworzenie gier z serii Baldur's Gate</li>
<li>Children of Bhaal (polskie forum BG) za hosting i wsparcie</li>
<li>Corvias za ikonę skrótu do EET</li>
<li>Corvias za ikonę skrótu do EET i testowanie na systemie linux</li>
<li>Crevs Daak za kod dla komputerów MAC (kontrybucje na GitHubie)</li>
<li>Fouinto za testowanie wersji beta</li>
<li>geminibruni za czcionki użyte w GUI</li>
Expand Down
31 changes: 16 additions & 15 deletions EET/lib/EET_core.tp2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BACKUP ~EET/backup/core~
AUTHOR ~K4thos (swit)~
VERSION ~1.0 RC7~
VERSION ~1.0 RC8~

/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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~

///// \\\\\
Expand Down
14 changes: 14 additions & 0 deletions EET/lib/bg1_BCS.tph
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion EET/lib/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
26 changes: 19 additions & 7 deletions EET/lib/transition.tph
Original file line number Diff line number Diff line change
Expand Up @@ -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

///// \\\\\
Expand Down
8 changes: 5 additions & 3 deletions EET/readme-EET.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ <h1>Baldur's Gate: Enhanced Edition Trilogy (EET)</h1>
<strong>Author</strong>: <a href="http://gibberlings3.net/forums/index.php?showuser=6804">K4thos</a><br>
<strong>Contributors</strong>: <a href="http://gibberlings3.net/forums/index.php?showuser=2909">WhiteAgnus</a>, <a href="http://gibberlings3.net/forums/index.php?showuser=8886">AWizardDidIt</a>, <a href="http://gibberlings3.net/forums/index.php?showuser=7356">CrevsDaak</a></p>
<p><strong>On the web: </strong><a href="http://www.gibberlings3.net/eet/"><strong>Home page</strong></a> and <a href="http://gibberlings3.net/forums/index.php?showforum=195"><strong>discussion forum</strong></a></p>
<p><strong>Version 1.0 <acronym title="(software development) A version of a program that is nearly ready for release but may still have a few bugs; the status between beta version and release version.">Release Candidate</acronym> 7</strong><br />
<p><strong>Version 1.0 <acronym title="(software development) A version of a program that is nearly ready for release but may still have a few bugs; the status between beta version and release version.">Release Candidate</acronym> 8</strong><br />
<strong>Languages: </strong>English, Polish, Spanish, German (unfinished), French (unfinished)<br />
<strong>Platforms: </strong>Windows, Mac OS X (needs testing)</p>
<strong>Platforms: </strong>Windows, Mac OS X, Linux (<a href="http://forums.pocketplane.net/index.php/topic,29259.msg337801.html#msg337801">case insensitive partitions</a>)</p>
</div>

<!-- ================== T a b l e ================== --><a id="table" name="Table of Contents"></a>
Expand Down Expand Up @@ -79,6 +79,8 @@ <h2>Installation</h2>

<div class="code">
<p>If you are planning to use other mods than you should consider using <a href="https://bitbucket.org/BigWorldSetup/">Big World Setup</a> (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.</p>

<p>Linux support is experimental and currently works only on <a href="http://forums.pocketplane.net/index.php/topic,29259.msg337801.html#msg337801">case insensitive partitions</a>. In future EET will be adopted to support case sensitive system natively.</p>
</div>

<h3>Initialise EET (setup-EET + setup-EET_core)</h3>
Expand Down Expand Up @@ -377,7 +379,7 @@ <h3>Kudos (in alphabetical order)</h3>
<li>Many thanks to Beamdog for creating Enhanced Editions of Infinity Engine games</li>
<li>Many thanks to Bioware and Black Isle Studios for creating Baldur's Gate series</li>
<li>Many thanks to Children of Bhaal forum for hosting and support</li>
<li>Many thanks to Corvias for EET icon</li>
<li>Many thanks to Corvias for EET icon and linux support testing</li>
<li>Many thanks to Crevs Daak for GitHub contributions to the project</li>
<li>Many thanks to Fouinto for beta testing</li>
<li>Many thanks to geminibruni for title fonts</li>
Expand Down
3 changes: 2 additions & 1 deletion EET/tbl/compatibility.tbl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit a0f91b6

Please sign in to comment.