Skip to content

Commit

Permalink
Version 1.0 Release Candidate 3
Browse files Browse the repository at this point in the history
- fixed Imoen DV references in Irenicus Dungeon dialogue files
- fixed Dialogue boarder window texture in BG2:EE GUI
- more comprehensive 2da expanding via 'Finalize EET' component
- installer no longer sets English language in game when mod is
installed with different language
- added missing BG:EE CHR files (lvl 1 Abdel etc.)
- new method used for item importation between SoD and Irenicus Dungeon
(also will be expended via EET_Tweaks)
- fixed problem with main component re-installation
- new reference table added to docs folder
- updated Polish translation
  • Loading branch information
K4thos committed Jul 30, 2016
1 parent 6e05754 commit b1a7a12
Show file tree
Hide file tree
Showing 26 changed files with 3,390 additions and 4,195 deletions.
55 changes: 42 additions & 13 deletions EET/EET.tp2
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ LANGUAGE ~Spanish~
~EET/lang/es_ES/2da.tra~
~EET/lang/es_ES/compatibility.tra~

BEGIN @900000 //Baldur's Gate: Enhanced Edition Trilogy (EET) - core component
BEGIN @900000 //Initialise EET (first mod in install order)
REQUIRE_PREDICATE ENGINE_IS ~bg2ee~ @900001 //Please install it on BG2:EE engine
FORBID_COMPONENT ~setup-bp-bgt-worldmap.tp2~ ~0~ @900002 //EET should be installed BEFORE BP-BGT Worldmap

Expand Down Expand Up @@ -351,10 +351,14 @@ END

COPY ~weidu.conf~ ~weidu.conf~
READ_2DA_ENTRY 0 2 3 "LANGUAGE_BG2"
INNER_PATCH_SAVE LANGUAGE_BG2 ~%LANGUAGE_BG2%~ BEGIN
REPLACE_EVALUATE CASE_INSENSITIVE ~\(..\)$~ BEGIN
TO_UPPER MATCH1
END ~%MATCH1%~
END
PATCH_PRINT ~LANGUAGE_BG2 = %LANGUAGE_BG2%~
BUT_ONLY

PRINT ~LANGUAGE_BG2 = %LANGUAGE_BG2%~

///// \\\\\
///// Extraction of TLK from BG:EE \\\\\
///// \\\\\
Expand All @@ -363,16 +367,16 @@ PRINT ~~
PRINT ~Extracting texts for translation from BG:EE...~

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"~
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/temp/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/temp/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/temp/bgee03.tra"~
LAM bash_log
END ELSE BEGIN
FAIL @900009 //TLK for language: %LANGUAGEcase% not found in %bgee_dir%
END

ACTION_FOR_EACH file IN bgee01 bgee02 bgee03 BEGIN
COPY + ~EET/%file%.tra~ ~EET~
COPY + ~EET/temp/%file%.tra~ ~EET/temp~
REPLACE_TEXTUALLY ~~~~~\([~"%]\)\[[^~"%]*\][ ]*~~~~~ ~~~~~\1~~~~~ //clear []s at the start of StrRefs//"
PHP_EACH remapped_wav AS source => dest BEGIN
REPLACE_TEXTUALLY ~\(\[\)%source%\(\]\)~ ~\1%dest%\2~
Expand Down Expand Up @@ -412,7 +416,7 @@ COPY - ~EET/lang/%LANGUAGE%/chapters.tra~ ~EET/lang/%LANGUAGE%~
REPLACE_TEXTUALLY ~%LNL%~ ~-NEWLINE-~
END
INNER_ACTION BEGIN
COPY + ~EET/bgee01.tra~ ~EET~
COPY + ~EET/temp/bgee01.tra~ ~EET/temp~
REPLACE_EVALUATE CASE_INSENSITIVE "^\(@%from%[ %TAB%]*=[ %TAB%]*\)~\([^~]+\)~.*$" BEGIN
//PATCH_PRINT ~Patching %SOURCE_FILESPEC%: REPLACED @%from%:%LNL%%MATCH2%%LNL%TO:%LNL%%text%~
END
Expand All @@ -422,9 +426,9 @@ COPY - ~EET/lang/%LANGUAGE%/chapters.tra~ ~EET/lang/%LANGUAGE%~
END ~~
END

LOAD_TRA ~EET/bgee01.tra~
LOAD_TRA ~EET/bgee02.tra~
LOAD_TRA ~EET/bgee03.tra~
LOAD_TRA ~EET/temp/bgee01.tra~
LOAD_TRA ~EET/temp/bgee02.tra~
LOAD_TRA ~EET/temp/bgee03.tra~

///// \\\\\
///// HANDLE_CHARSETS \\\\\
Expand Down Expand Up @@ -1897,6 +1901,28 @@ APPEND_OUTER + ~EET/temp/are.tph~ ~%logged%~
COPY_EXISTING ~OH1000.ARE~ ~override/BG0000.ARE~
WRITE_ASCII 0x94 ~BG0000~ #8

COPY_EXISTING ~BD6100.ARE~ ~override~
~AR0602.ARE~ ~override~
LPF fj_are_structure
INT_VAR
fj_type = 8 //nonvisible
fj_loc_x = 88
fj_loc_y = 76
fj_box_left = 72
fj_box_top = 26
fj_box_right = 120
fj_box_bottom = 58
fj_trap_loc_x = 80
fj_trap_loc_y = 70
fj_vertex_0 = 111 + (58 << 16)
fj_vertex_1 = 72 + (45 << 16)
fj_vertex_2 = 82 + (26 << 16)
fj_vertex_3 = 120 + (39 << 16)
STR_VAR
fj_structure_type = container
fj_name = ~K#ImportContainer~
END

/*COPY_EXISTING ~TU0015.are~ ~override~
~TU0016.are~ ~override~
~TU0017.are~ ~override~
Expand Down Expand Up @@ -1964,7 +1990,7 @@ PRINT ~Installing CHR files...~

MKDIR ~characters~

ACTION_BASH_FOR ~EET/temp/chr~ ~^.+\.chr$~ BEGIN
ACTION_BASH_FOR ~%patch_dir%/chr~ ~^.+\.chr$~ BEGIN
COPY ~%BASH_FOR_FILESPEC%~ ~characters~
LPF ~EET_expand_tlk~ INT_VAR max = StrRef_cutoff RET log END
PATCH_LOG ~%log%~
Expand Down Expand Up @@ -2522,9 +2548,12 @@ BUT_ONLY
//manual edits
COPY + ~EET/tbl/map_mods_areas.tbl~ ~EET/temp/map_bgee_areas.tbl~ //only used by BP-BGT Worldmap

COPY + ~EET/temp/map_sod_links.tbl~ ~EET/temp~
REPLACE_TEXTUALLY ~\(BD2000[ %TAB%]+W[ %TAB%]+BD3000[ %TAB%]+EXITN[ %TAB%]+\)84~ ~\142~

COPY + ~EET/temp/map_bgee_links.tbl~ ~EET/temp~
APPEND_FILE ~EET/tbl/map_mods_links.tbl~
APPEND_FILE ~EET/temp/map_sod_links.tbl~
APPEND_FILE ~EET/tbl/map_mods_links.tbl~

COPY + ~EET/temp/map_bgee_trans.tra~ ~EET/temp~
REPLACE_EVALUATE CASE_INSENSITIVE ~^\(@[A-Z0-9]+\)\(.*[%newline%]*\)~ BEGIN
Expand Down
104 changes: 88 additions & 16 deletions EET/compile/baf/K#TELBGT.baf
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ THEN
RESPONSE #100
SetGlobal("K#AdvanceTimeOneMonth","GLOBAL",1)
SetGlobal("K#temp","GLOBAL",29)
AddGlobals("K#DaysPassed","K#temp")
AdvanceTime(ONE_MONTH)
AddGlobals("K#DaysPassed","K#temp")
TakeObjectGoldGlobal("K#ImportGold","GLOBAL",Player1)
//ActionOverride("K#ImportContainer00",TakeItemListPartyNum("IMPORT01",1))
//ActionOverride("K#ImportContainer00",TakeItemListPartyNum("IMPORT02",1))
//ActionOverride("K#ImportContainer00",TakeItemListPartyNum("IMPORT03",1))
//ActionOverride("K#ImportContainer00",TakeItemListPartyNum("K#IMPORT",99))
//ActionOverride("K#ImportContainer01",TakeCreatureItems(Player1,ALL))
//ActionOverride("K#ImportContainer01",TakeCreatureItems(Player2,ALL))
//ActionOverride("K#ImportContainer01",TakeCreatureItems(Player3,ALL))
//ActionOverride("K#ImportContainer01",TakeCreatureItems(Player4,ALL))
//ActionOverride("K#ImportContainer01",TakeCreatureItems(Player5,ALL))
//ActionOverride("K#ImportContainer01",TakeCreatureItems(Player6,ALL))
ActionOverride(Myself,TakeItemListPartyNum("IMPORT01",1))
ActionOverride(Myself,TakeItemListPartyNum("IMPORT02",1))
ActionOverride(Myself,TakeItemListPartyNum("IMPORT03",1))
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",17))
ActionOverride("K#ImportContainer",TakeCreatureItems(Player1,ALL))
ActionOverride("K#ImportContainer",TakeCreatureItems(Player2,ALL))
ActionOverride("K#ImportContainer",TakeCreatureItems(Player3,ALL))
ActionOverride("K#ImportContainer",TakeCreatureItems(Player4,ALL))
ActionOverride("K#ImportContainer",TakeCreatureItems(Player5,ALL))
ActionOverride("K#ImportContainer",TakeCreatureItems(Player6,ALL))
END

IF
Expand Down Expand Up @@ -69,13 +69,86 @@ THEN
Continue()
END

IF
InPartyAllowDead(Player6)
!Name("None",Player6)
THEN
RESPONSE #100
ActionOverride(Player6,LeaveParty())
ActionOverride(Player6,DestroySelf())
Continue()
END

IF
NumInParty(6)
THEN
RESPONSE #100
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
Continue()
END

IF
NumInParty(5)
THEN
RESPONSE #100
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
Continue()
END

IF
NumInParty(4)
THEN
RESPONSE #100
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
Continue()
END

IF
NumInParty(3)
THEN
RESPONSE #100
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
Continue()
END

IF
NumInParty(2)
THEN
RESPONSE #100
ActionOverride(Myself,TakeItemListPartyNum("K#IMPORT",20))
ActionOverride(Myself,GivePartyAllEquipment())
Continue()
END

IF
True()
THEN
RESPONSE #100
//ActionOverride("K#ImportContainer00",GivePartyAllEquipment())
//CopyGroundPilesTo("AR0602",[3081.2737])
//DestroyGroundPiles()
ActionOverride(Myself,GivePartyAllEquipment())
SetGlobal("SPRITE_IS_DEADCALAHAN","GLOBAL",0)
SetGlobal("SPRITE_IS_DEADCARBOS","GLOBAL",0)
SetGlobal("SPRITE_IS_DEADDIANA","GLOBAL",0)
Expand Down Expand Up @@ -103,6 +176,5 @@ THEN
ActionOverride(Player5,LeaveAreaLUA("AR0602","",[3824.2447],E))
ActionOverride(Player6,LeaveAreaLUA("AR0602","",[3889.2479],SSE))
MultiPlayerSync()
Wait(2)
SetCursorState(TRUE) //otherwise Imoen will not run her Override script
DestroySelf()
END
Loading

0 comments on commit b1a7a12

Please sign in to comment.