diff --git a/EET/EET.tp2 b/EET/EET.tp2 index b5591019..11fb82f6 100644 --- a/EET/EET.tp2 +++ b/EET/EET.tp2 @@ -1,6 +1,6 @@ BACKUP ~EET/backup~ AUTHOR ~K4thos (swit)~ -VERSION ~beta 0.9~ +VERSION ~1.0 RC4~ README ~EET/lang/%LANGUAGE%/readme-EET.html~ ~EET/readme-EET.html~ LANGUAGE ~English~ @@ -1423,11 +1423,12 @@ SetPrivateProfileString('%row%','%option%','%option_1%') "Debug Mode" , 1 => "Program Options" "Logging On" , 1 => "Program Options" "Cheats" , 1 => "Game Options" + "Show Black Space" , 0 => "Graphics" "BG4LOGO" , 1 => "MOVIES" "BILOGO" , 1 => "MOVIES" "BLACKPI_" , 1 => "MOVIES" "BWDRAGON" , 1 => "MOVIES" - "CREDITS_" , 1 => "MOVIES" + "CREDITS" , 1 => "MOVIES" "INFELOGO" , 1 => "MOVIES" "INTRO_" , 1 => "MOVIES" "INTRO15F" , 1 => "MOVIES" @@ -1452,11 +1453,12 @@ SetPrivateProfileString('Program Options','Active Campaign','0') SetPrivateProfileString('Program Options','Debug Mode','1') SetPrivateProfileString('Program Options','Logging On','1') SetPrivateProfileString('Game Options','Cheats','1') +SetPrivateProfileString('Graphics','Show Black Space','0') SetPrivateProfileString('MOVIES','BG4LOGO','1') SetPrivateProfileString('MOVIES','BILOGO','1') SetPrivateProfileString('MOVIES','BLACKPI_','1') SetPrivateProfileString('MOVIES','BWDRAGON','1') -SetPrivateProfileString('MOVIES','CREDITS_','1') +SetPrivateProfileString('MOVIES','CREDITS','1') SetPrivateProfileString('MOVIES','INFELOGO','1') SetPrivateProfileString('MOVIES','INTRO_','1') SetPrivateProfileString('MOVIES','INTRO15F','1') @@ -1898,9 +1900,6 @@ COPY + ~.../blank.txt~ ~EET/temp/are.tph~ PATCH_LOG ~%logged%~ 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 @@ -1923,6 +1922,18 @@ COPY_EXISTING ~BD6100.ARE~ ~override~ fj_name = ~K#ImportContainer~ END +// patching BG3300 (Beregost) +ACTION_DEFINE_ARRAY tilesToFix BEGIN 3799 3800 3879 3880 END +LAF FIX_WATER INT_VAR numTilesToFix = 4 STR_VAR wed = ~bg3300.wed~ END + +// patching BG3000 +ACTION_DEFINE_ARRAY tilesToFix BEGIN 2588 END +LAF FIX_WATER INT_VAR numTilesToFix = 1 STR_VAR wed = ~bg3000.wed~ END + +// patching BG1802 +ACTION_DEFINE_ARRAY tilesToFix BEGIN 1292 1293 END +LAF FIX_WATER INT_VAR numTilesToFix = 2 STR_VAR wed = ~bg1802.wed~ END + /*COPY_EXISTING ~TU0015.are~ ~override~ ~TU0016.are~ ~override~ ~TU0017.are~ ~override~ @@ -2273,6 +2284,12 @@ COPY_EXISTING ~BPRNG1.ITM~ ~override~ LPF DELETE_ITEM_EQEFFECT INT_VAR opcode_to_delete = "208" END //Minimum HP BUT_ONLY +//Modify permanent sleep spell effect (SoD Final) +COPY_EXISTING ~BDDAGG06.ITM~ ~override~ + ~BDDAGG07.ITM~ ~override~ + LPF ALTER_ITEM_EFFECT INT_VAR check_headers = 1 match_opcode = 39 /*Sleep*/ timing = 0 /*Instant/Limited*/ duration = 7200 /*ONE_DAY*/ END +BUT_ONLY + ///// \\\\\ ///// PRO \\\\\ ///// \\\\\ @@ -2292,6 +2309,8 @@ 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#REST.SPL~ ~override~ + ~EET/base/spl/K#UNREST.SPL~ ~override~ ACTION_FOR_EACH var IN 4 6 9 12 24 BEGIN COPY ~EET/base/spl/K#CURE.SPL~ ~override/K#CURE%var%.SPL~ WRITE_LONG 0x9e "%var%" @@ -2628,110 +2647,50 @@ ACTION_FOR_EACH file IN areas.tbl links.tbl trans.tra BEGIN END //EET worldmap + COPY + ~EET/tbl/map_eet_areas.tbl~ ~EET/temp~ APPEND_FILE ~EET/temp/map_bg2_areas.tbl~ APPEND_FILE ~EET/temp/map_tob_areas.tbl~ + LPF fix_table END + LPM read_area_array_from_2da COPY + ~Worldmap/map_mods_links.tbl~ ~EET/temp/map_eet_links.tbl~ APPEND_FILE ~EET/temp/map_bg2_links.tbl~ APPEND_FILE ~EET/tbl/map_ar3000_links.tbl~ //for some reason BG2:EE doesn't have links to Watcher's Keep (XL3000.2DA only has links from it) APPEND_FILE ~EET/temp/map_tob_links.tbl~ + LPF fix_table END + LPM read_link_array_from_2da COPY + ~Worldmap/map_mods_trans.tra~ ~EET/temp/map_eet_trans.tra~ APPEND_FILE ~EET/temp/map_bg2_trans.tra~ APPEND_FILE ~EET/temp/map_tob_trans.tra~ + LPF fix_table END + LPM read_trans_array_from_2da -COPY ~EET/base/worldmap.wmp~ ~override~ - -//awful code as a workaround for a bug: http://www.shsforums.net/topic/45358-nearinfinity/page-34#entry586098 -//I'm planning to write something better with arrays in future -COPY - ~EET/temp/map_eet_areas.tbl~ ~.../EET/temp~ - REPLACE_EVALUATE CASE_INSENSITIVE ~^\([A-Z0-9#_]+\)[ %TAB%]+\([A-Z0-9#_]+\)[ %TAB%]+\([A-Z0-9#_]+\)[ %TAB%]+\([0-9]+\)[ %TAB%]+\([0-9]+\)[ %TAB%]+\([0-9\-]+\)[ %TAB%]+\([0-9\-]+\)[ %TAB%]+\([A-Z0-9#_@]+\)[ %TAB%]+\([A-Z0-9#_@]+\)~ BEGIN - SPRINT are_areName ~%MATCH1%~ - PATCH_FOR_EACH var IN MATCH8 MATCH9 BEGIN - SPRINT match EVAL ~%%var%%~ - PATCH_IF ~%match%~ STRING_EQUAL_CASE ~N~ BEGIN - SPRINT EVAL ~%var%~ ~~ - END ELSE BEGIN - INNER_ACTION BEGIN - COPY - ~EET/temp/map_eet_trans.tra~ ~.../EET/temp~ - REPLACE_EVALUATE CASE_INSENSITIVE ~~~~~^\([ %TAB%]*%match%[ %TAB%]*=[ %TAB%]*[~"]\)\([^~^"]+\)\([~"]\)~~~~~ BEGIN - INNER_PATCH_SAVE string "%MATCH2%" BEGIN - REPLACE_TEXTUALLY "###" " " - END - SPRINT EVAL ~%var%~ ~%string%~ - END ~~ - END - END - END - SPRINT are_strName ~%MATCH8%~ - SPRINT are_strDesc ~%MATCH9%~ - SET are_visible = 0 - SET are_visibleAdjacent = 0 - SET are_reachable = 0 - SET are_visited = 0 - PATCH_IF (MATCH4 BAND BIT0) BEGIN - SET are_visible = 1 - END - PATCH_IF (MATCH4 BAND BIT1) BEGIN - SET are_visibleAdjacent = 1 - END - PATCH_IF (MATCH4 BAND BIT2) BEGIN - SET are_reachable = 1 - END - PATCH_IF (MATCH4 BAND BIT3) BEGIN - SET are_visited = 1 - END - INNER_ACTION BEGIN - LAF sc#addWmpAre - INT_VAR - mapIcon = MATCH5 //BAM_ANIM - xCoord = MATCH6 //X_POS - yCoord = MATCH7 //Y_POS - //FLAGS - visible = are_visible - visibleAdjacent = are_visibleAdjacent - reachable = are_reachable - visited = are_visited - STR_VAR - areName = EVAL "%are_areName%" //SHORT_NAME, CONTENT, LONG_NAME - strName = EVAL "%are_strName%" //NAME (string) - strDesc = EVAL "%are_strDesc%" //TOOLTIP (string) - END - END - END ~~ -COPY - ~EET/temp/map_eet_links.tbl~ ~.../EET/temp~ - REPLACE_EVALUATE CASE_INSENSITIVE ~^\([A-Z0-9#_]+\)[ %TAB%]+\([A-Z]+\)[ %TAB%]+\([A-Z0-9#_]+\)[ %TAB%]+\([A-Z0-9#_]+\)[ %TAB%]+\([0-9]+\)[ %TAB%]+\([0-9]+\)[ %TAB%]+\([A-Z0-9#_]+\)[ %TAB%]+\([A-Z0-9#_]+\)[ %TAB%]+\([A-Z0-9#_]+\)[ %TAB%]+\([A-Z0-9#_]+\)[ %TAB%]+\([A-Z0-9#_]+\)[ %TAB%]+\([0-9]+\)~ BEGIN - PATCH_FOR_EACH var IN MATCH4 MATCH7 MATCH8 MATCH9 MATCH10 MATCH11 BEGIN - SPRINT match EVAL ~%%var%%~ - PATCH_IF ~%match%~ STRING_EQUAL_CASE ~N~ BEGIN - SPRINT EVAL ~%var%~ ~~ - END - END - INNER_PATCH_SAVE MATCH4 "%MATCH4%" BEGIN - REPLACE_TEXTUALLY "###" " " - END - INNER_ACTION BEGIN - COPY_EXISTING ~worldmap.wmp~ ~override~ - LPF ADD_WORLDMAP_LINKS - INT_VAR - distance_scale = MATCH5 //TRV_TIME - default_entry = MATCH6 //DEF_ENTRY - encounter_probability = MATCH12 //ENC_PROB - STR_VAR - from_area = EVAL ~%MATCH1%~ //SRC_AREA - from_node = EVAL ~%MATCH2%~ //SRC_NWSE - to_area = EVAL ~%MATCH3%~ //TARGET_ARE - entry = EVAL ~%MATCH4%~ //ENTRY_NAME - random_area1 = EVAL ~%MATCH7%~ //ENC1 - random_area2 = EVAL ~%MATCH8%~ //ENC2 - random_area3 = EVAL ~%MATCH9%~ //ENC3 - random_area4 = EVAL ~%MATCH10%~ //ENC4 - random_area5 = EVAL ~%MATCH11%~ //ENC5 - END - BUT_ONLY - END - END ~~ +LAM merge_in_translations + +COPY_EXISTING ~worldmap.wmp~ ~override~ + READ_LONG 0xc mo + READ_LONG mo + 0x20 na + READ_LONG mo + 0x24 ao + READ_LONG mo + 0x28 lo + READ_LONG mo + 0x2c nl + FOR (i = 0; i < nl; ++i) BEGIN + DELETE_BYTES lo 0xd8 + END + FOR (i = 0; i < na; ++i) BEGIN + DELETE_BYTES ao 0xf0 + SET lo = lo - 0xf0 + END + WRITE_LONG mo + 0x20 0 + WRITE_LONG mo + 0x24 ao + WRITE_LONG mo + 0x28 lo + WRITE_LONG mo + 0x2c 0 +BUT_ONLY + +INCLUDE ~EET/lib/build_worldmap.tpa~ + +//SOD BG Worldmap COPY ~%patch_dir%/BGMAP.wmp~ ~override~ LPF ~EET_expand_tlk~ INT_VAR max = StrRef_cutoff RET log END @@ -2939,7 +2898,7 @@ ACTION_IF ( currentTotal > 0 ) BEGIN END ///// \\\\\ -///// Finalize installation \\\\\ +///// Finalise installation \\\\\ ///// \\\\\ COPY ~.../blank.txt~ ~override/EET.flag~ diff --git a/EET/base/2da/CAMPAIGN.2DA b/EET/base/2da/CAMPAIGN.2DA index 66e69ca7..88097c2e 100644 --- a/EET/base/2da/CAMPAIGN.2DA +++ b/EET/base/2da/CAMPAIGN.2DA @@ -1,10 +1,10 @@ 2DA V1.0 * WORLDSCRIPT DESCRIPTION ICON INTERDIA LOADHINT MASTAREA MUSIC NAME NPCLEVEL TBPPARTY PDIALOG SAVE_DIR STARTARE STRTGOLD STARTPOS STWEAPON 25STWEAP XPCAP XPLIST WORLDMAP WORLDSCRIPT MAP_DROPSHADOW MAP_FONTCOLOR KEEP_POWERS INTRO_MOVIE IMPORT INTERACT YEARS REPUTATION CLASTEXT RACETEXT -SOA BALDUR 4000102 2 INTERDIA * MASTAREA 33 4000109 NPCLEVEL * PDIALOG save STARTARE STRTGOLD STARTPOS * * * * WORLDMAP BALDUR 1 0xFFFFFFFF 1 INTRO15F PARTY INTERACT YEARS REPUTATI CLASTEXT RACETEXT -TOB BALDUR25 4000103 3 25BANTER * MASTAREA 81 4000110 NPCLVL25 * 25DIALOG save 25STARTA STRTGOLD 25STARTP 25STWEAP 25STWEAP * * WORLDMAP BALDUR25 1 0xFFFFFFFF 0 INTRO PARTY INTERACT 25YEARS REPUTATI CLASTEXT RACETEXT -BG1 BALDUR 4000100 0 BGBANTER * MASTAREA 159 4000107 BGNPCLVL * BGDIALOG save BGSTARTA STRTGOLD BGSTARTP STWEAPON STWEAPON * * WORLDMAP BALDUR 1 0xFFFFFFFF 0 INTRO_ PARTY INTERACT BGYEARS REPUTATI BGCLATXT BGRACTXT -SOD BDBALDUR 4000101 1 BDBANTER * MASTAREA 152 4000108 NPCLVLDS * BDDIALOG save SODSTRTA STRTGOLD SODSTPOS SODWEAP BDSTWEAP * * BGMAP BDBALDUR 1 0xFFFFFFFF 1 SODCIN01 PARTY SODINTER SODYEARS REPUTATI SODCLTXT SODRACE +SOA BALDUR 4000102 2 INTERDIA * MASTAREA 33 4000109 * * PDIALOG save STARTARE STRTGOLD STARTPOS * * * * WORLDMAP BALDUR 1 0xFFFFFFFF 1 INTRO15F PARTY INTERACT YEARS REPUTATI CLASTEXT RACETEXT +TOB BALDUR25 4000103 3 25BANTER * MASTAREA 81 4000110 * * 25DIALOG save 25STARTA STRTGOLD 25STARTP 25STWEAP 25STWEAP * * WORLDMAP BALDUR25 1 0xFFFFFFFF 0 INTRO PARTY INTERACT 25YEARS REPUTATI CLASTEXT RACETEXT +BG1 BALDUR 4000100 0 BGBANTER * MASTAREA 159 4000107 * * BGDIALOG save BGSTARTA STRTGOLD BGSTARTP STWEAPON STWEAPON * * WORLDMAP BALDUR 1 0xFFFFFFFF 0 INTRO_ PARTY INTERACT BGYEARS REPUTATI BGCLATXT BGRACTXT +SOD BDBALDUR 4000101 1 BDBANTER * MASTAREA 152 4000108 * * BDDIALOG save SODSTRTA STRTGOLD SODSTPOS SODWEAP BDSTWEAP * * BGMAP BDBALDUR 1 0xFFFFFFFF 1 SODCIN01 PARTY SODINTER SODYEARS REPUTATI SODCLTXT SODRACE BP1 BALDUR 4000104 4 * * MASTAREA 106 4000111 * TBPPART_ * bpsave STARTBP_ STRTGOLD * * * * * WORLDMAP BALDUR 1 0xFFFFFFFF 0 BLACKPI_ PARTY * BGYEARS * * * BP2 BALDUR 4000105 5 * * MASTAREA 106 4000112 * TBPPARTY * bpsave STARTBP STRTGOLD * * * * * WORLDMAP BALDUR 1 0xFFFFFFFF 0 BLACKPIT PARTY * YEARS * * * TUT BALDUR 4000106 6 * * MASTAREA 136 4000113 * * * save TUSTARTA STRTGOLD TUSTARTP STWEAPON STWEAPON * * WORLDMAP BALDUR 1 0xFFFFFFFF 0 BGENTER PARTY * BGYEARS REPUTATI BGCLATXT BGRACTXT diff --git a/EET/base/lua/util.lua b/EET/base/lua/util.lua index 10b699f3..030d3156 100644 --- a/EET/base/lua/util.lua +++ b/EET/base/lua/util.lua @@ -502,7 +502,7 @@ function chapterText() elseif (chapter == 19) then return Infinity_FetchString(74353) elseif (chapter < 23) then - return Infinity_FetchString(70999 + chapter) + return Infinity_FetchString(71000 + chapter) else return t("ARENA_MODE_LABEL") end diff --git a/EET/base/movies/CREDITS_.wbm b/EET/base/movies/CREDITS.wbm similarity index 100% rename from EET/base/movies/CREDITS_.wbm rename to EET/base/movies/CREDITS.wbm diff --git a/EET/base/spl/K#REST.SPL b/EET/base/spl/K#REST.SPL new file mode 100644 index 00000000..a298353c Binary files /dev/null and b/EET/base/spl/K#REST.SPL differ diff --git a/EET/base/spl/K#UNREST.SPL b/EET/base/spl/K#UNREST.SPL new file mode 100644 index 00000000..10c214c5 Binary files /dev/null and b/EET/base/spl/K#UNREST.SPL differ diff --git a/EET/base/worldmap.wmp b/EET/base/worldmap.wmp deleted file mode 100644 index a8d567cf..00000000 Binary files a/EET/base/worldmap.wmp and /dev/null differ diff --git a/EET/compile/baf/BG0000.baf b/EET/compile/baf/BG0000.baf deleted file mode 100644 index 07806d8e..00000000 --- a/EET/compile/baf/BG0000.baf +++ /dev/null @@ -1,11 +0,0 @@ -//unused random encounter area - -IF - Global("K#DoOnce","BG0000",0) -THEN - RESPONSE #100 - SetGlobal("K#DoOnce","BG0000",1) - Explore() - PlaySound("error10") - //DisplayStringNoName(Player1,16493) // You have been waylaid by enemies and must defend yourself! -END diff --git a/EET/compile/baf/K#TELBGT.baf b/EET/compile/baf/K#TELBGT.baf index e2287c07..3589e939 100644 --- a/EET/compile/baf/K#TELBGT.baf +++ b/EET/compile/baf/K#TELBGT.baf @@ -1,9 +1,20 @@ IF - Global("K#AdvanceTimeOneMonth","GLOBAL",0) + Global("K#FrameDelay","LOCALS",0) THEN RESPONSE #100 - SetGlobal("K#AdvanceTimeOneMonth","GLOBAL",1) + SetGlobal("K#FrameDelay","LOCALS",1) SetGlobal("K#temp","GLOBAL",29) + 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 + ActionOverride(Player2,MakeUnselectable(1)) + ActionOverride(Player3,MakeUnselectable(1)) + ActionOverride(Player4,MakeUnselectable(1)) + ActionOverride(Player5,MakeUnselectable(1)) + ActionOverride(Player6,MakeUnselectable(1)) AdvanceTime(ONE_MONTH) AddGlobals("K#DaysPassed","K#temp") TakeObjectGoldGlobal("K#ImportGold","GLOBAL",Player1) @@ -19,6 +30,19 @@ THEN ActionOverride("K#ImportContainer",TakeCreatureItems(Player6,ALL)) END +IF + Global("K#FrameDelay","LOCALS",1) +THEN + RESPONSE #100 + SetGlobal("K#FrameDelay","LOCALS",2) + ApplySpellRES("K#UNREST",Player1) // No such index + ApplySpellRES("K#UNREST",Player2) // No such index + ApplySpellRES("K#UNREST",Player3) // No such index + ApplySpellRES("K#UNREST",Player4) // No such index + ApplySpellRES("K#UNREST",Player5) // No such index + ApplySpellRES("K#UNREST",Player6) // No such index +END + IF InPartyAllowDead(Player2) !Name("None",Player2) diff --git a/EET/lang/de_DE/2da.tra b/EET/lang/de_DE/2da.tra index ee4ed304..63bbc6ae 100644 --- a/EET/lang/de_DE/2da.tra +++ b/EET/lang/de_DE/2da.tra @@ -80,3 +80,7 @@ If you're unsure what to do please check the readme file included in the mod pac @4000222 = ~000000029-Chapter 20 Start~ @4000223 = ~000000030-Chapter 21 Start~ @4000224 = ~000000031-Chapter 22 Start~ + +//Worldmap GUI Strings +@4000300 = ~Hours~ +@4000301 = ~Unreachable~ diff --git a/EET/lang/de_DE/setup.tra b/EET/lang/de_DE/setup.tra index bbcabe1f..36ce03b9 100644 --- a/EET/lang/de_DE/setup.tra +++ b/EET/lang/de_DE/setup.tra @@ -20,7 +20,7 @@ Is this correct? [Y]es (keep it as it is) or [N]o (change it to %LANGUAGEcase%)~ //setup-EET_end component names @910000 = ~Update old EET saves to work with new installation~ //this one is not stored in WeiDU.log @910001 = ~Alternative EET GUI (SoD)~ -@910002 = ~Finalize EET (last mod in install order)~ +@910002 = ~Finalise EET (last mod in install order)~ //setup-EET_end messages during installation @910003 = ~You must have EET core component installed~ diff --git a/EET/lang/en_US/2da.tra b/EET/lang/en_US/2da.tra index 60a651b0..0460b2d2 100644 --- a/EET/lang/en_US/2da.tra +++ b/EET/lang/en_US/2da.tra @@ -80,3 +80,7 @@ If you're unsure what to do please check the readme file included in the mod pac @4000222 = ~000000029-Chapter 20 Start~ @4000223 = ~000000030-Chapter 21 Start~ @4000224 = ~000000031-Chapter 22 Start~ + +//Worldmap GUI Strings +@4000300 = ~Hours~ +@4000301 = ~Unreachable~ diff --git a/EET/lang/en_US/setup.tra b/EET/lang/en_US/setup.tra index bbcabe1f..36ce03b9 100644 --- a/EET/lang/en_US/setup.tra +++ b/EET/lang/en_US/setup.tra @@ -20,7 +20,7 @@ Is this correct? [Y]es (keep it as it is) or [N]o (change it to %LANGUAGEcase%)~ //setup-EET_end component names @910000 = ~Update old EET saves to work with new installation~ //this one is not stored in WeiDU.log @910001 = ~Alternative EET GUI (SoD)~ -@910002 = ~Finalize EET (last mod in install order)~ +@910002 = ~Finalise EET (last mod in install order)~ //setup-EET_end messages during installation @910003 = ~You must have EET core component installed~ diff --git a/EET/lang/es_ES/2da.tra b/EET/lang/es_ES/2da.tra index f48e5daf..8b0c94fd 100644 --- a/EET/lang/es_ES/2da.tra +++ b/EET/lang/es_ES/2da.tra @@ -80,3 +80,7 @@ If you're unsure what to do please check the readme file included in the mod pac @4000222 = ~000000029-Chapter 20 Start~ @4000223 = ~000000030-Chapter 21 Start~ @4000224 = ~000000031-Chapter 22 Start~ + +//Worldmap GUI Strings +@4000300 = ~Hours~ +@4000301 = ~Unreachable~ diff --git a/EET/lang/es_ES/setup.tra b/EET/lang/es_ES/setup.tra index bbcabe1f..36ce03b9 100644 --- a/EET/lang/es_ES/setup.tra +++ b/EET/lang/es_ES/setup.tra @@ -20,7 +20,7 @@ Is this correct? [Y]es (keep it as it is) or [N]o (change it to %LANGUAGEcase%)~ //setup-EET_end component names @910000 = ~Update old EET saves to work with new installation~ //this one is not stored in WeiDU.log @910001 = ~Alternative EET GUI (SoD)~ -@910002 = ~Finalize EET (last mod in install order)~ +@910002 = ~Finalise EET (last mod in install order)~ //setup-EET_end messages during installation @910003 = ~You must have EET core component installed~ diff --git a/EET/lang/fr_FR/2da.tra b/EET/lang/fr_FR/2da.tra index 519751e6..7e154a93 100644 --- a/EET/lang/fr_FR/2da.tra +++ b/EET/lang/fr_FR/2da.tra @@ -80,3 +80,7 @@ If you're unsure what to do please check the readme file included in the mod pac @4000222 = ~000000029-Chapter 20 Start~ @4000223 = ~000000030-Chapter 21 Start~ @4000224 = ~000000031-Chapter 22 Start~ + +//Worldmap GUI Strings +@4000300 = ~Hours~ +@4000301 = ~Unreachable~ diff --git a/EET/lang/fr_FR/setup.tra b/EET/lang/fr_FR/setup.tra index bbcabe1f..36ce03b9 100644 --- a/EET/lang/fr_FR/setup.tra +++ b/EET/lang/fr_FR/setup.tra @@ -20,7 +20,7 @@ Is this correct? [Y]es (keep it as it is) or [N]o (change it to %LANGUAGEcase%)~ //setup-EET_end component names @910000 = ~Update old EET saves to work with new installation~ //this one is not stored in WeiDU.log @910001 = ~Alternative EET GUI (SoD)~ -@910002 = ~Finalize EET (last mod in install order)~ +@910002 = ~Finalise EET (last mod in install order)~ //setup-EET_end messages during installation @910003 = ~You must have EET core component installed~ diff --git a/EET/lang/pl_PL/2da.tra b/EET/lang/pl_PL/2da.tra index e871606a..e5f09448 100644 --- a/EET/lang/pl_PL/2da.tra +++ b/EET/lang/pl_PL/2da.tra @@ -42,11 +42,11 @@ Welcome to Black Pits II: Gladiators of Thay, a follow-up to Baeloth's Black Pit Welcome to the Ducal Palace, the tutorial area for Baldur's Gate: Enhanced Edition. This is a simple walk-through of some of the basic skills you will need to play and enjoy the game. Once the tutorial area has loaded, an NPC (non-player character) will guide you through fighting monsters, casting spells, the use of thieving abilities, and some of the more common interactions you will experience in the game world.~ @4000107 = ~Baldur's Gate~ @4000108 = ~Siege of Dragonspear~ -@4000109 = ~Shadows of Amn~ -@4000110 = ~Throne of Bhaal~ +@4000109 = ~Cienie Amn~ +@4000110 = ~Tron Bhaala~ @4000111 = ~The Black Pits~ @4000112 = ~The Black Pits II: Gladiators of Thay~ -@4000113 = ~Tutorial~ +@4000113 = ~Samouczek~ @4000114 = ~WARNING~ @4000115 = ~Baldur's Gate: Enhanced Edition Trilogy mod installation has not been finished yet. @@ -55,28 +55,32 @@ AFTER installing all other mods please run "setup-EET_end.exe" to finalise the i If you're unsure what to do please check the readme file included in the mod package.~ //SAVENAME.2DA -@4000200 = ~000000007-Prologue Start~ -@4000201 = ~000000008-Chapter 1 Start~ -@4000202 = ~000000009-Chapter 2 Start~ -@4000203 = ~000000010-Chapter 3 Start~ -@4000204 = ~000000011-Chapter 4 Start~ -@4000205 = ~000000012-Chapter 5 Start~ -@4000206 = ~000000013-Chapter 6 Start~ -@4000207 = ~000000014-Chapter 7 Start~ -@4000208 = ~000000015-Chapter 7 Dungeon~ -@4000209 = ~000000016-Chapter 8 Start~ -@4000210 = ~000000017-Chapter 9 Start~ -@4000211 = ~000000018-Chapter 10 Start~ -@4000212 = ~000000019-Chapter 11 Start~ -@4000213 = ~000000020-Chapter 12 Start~ -@4000214 = ~000000021-Chapter 13 Start~ -@4000215 = ~000000022-Chapter 13 Dungeon~ -@4000216 = ~000000023-Chapter 14 Start~ -@4000217 = ~000000024-Chapter 15 Start~ -@4000218 = ~000000025-Chapter 16 Start~ -@4000219 = ~000000026-Chapter 17 Start~ -@4000220 = ~000000027-Chapter 18 Start~ -@4000221 = ~000000028-Chapter 19 Start~ -@4000222 = ~000000029-Chapter 20 Start~ -@4000223 = ~000000030-Chapter 21 Start~ -@4000224 = ~000000031-Chapter 22 Start~ +@4000200 = ~000000007-Prolog~ +@4000201 = ~000000008-Rozdzia³ 1~ +@4000202 = ~000000009-Rozdzia³ 2~ +@4000203 = ~000000010-Rozdzia³ 3~ +@4000204 = ~000000011-Rozdzia³ 4~ +@4000205 = ~000000012-Rozdzia³ 5~ +@4000206 = ~000000013-Rozdzia³ 6~ +@4000207 = ~000000014-Rozdzia³ 7~ +@4000208 = ~000000015-Rozdzia³ 7 Grobowiec~ +@4000209 = ~000000016-Rozdzia³ 8~ +@4000210 = ~000000017-Rozdzia³ 9~ +@4000211 = ~000000018-Rozdzia³ 10~ +@4000212 = ~000000019-Rozdzia³ 11~ +@4000213 = ~000000020-Rozdzia³ 12~ +@4000214 = ~000000021-Rozdzia³ 13~ +@4000215 = ~000000022-Rozdzia³ 13 Lochy~ +@4000216 = ~000000023-Rozdzia³ 14~ +@4000217 = ~000000024-Rozdzia³ 15~ +@4000218 = ~000000025-Rozdzia³ 16~ +@4000219 = ~000000026-Rozdzia³ 17~ +@4000220 = ~000000027-Rozdzia³ 18~ +@4000221 = ~000000028-Rozdzia³ 19~ +@4000222 = ~000000029-Rozdzia³ 20~ +@4000223 = ~000000030-Rozdzia³ 21~ +@4000224 = ~000000031-Rozdzia³ 22~ + +//Worldmap GUI Strings +@4000300 = ~Godziny~ +@4000301 = ~Nieosi¹galne~ diff --git a/EET/lang/pl_PL/readme-EET.html b/EET/lang/pl_PL/readme-EET.html index 23f9fc82..ab908e82 100644 --- a/EET/lang/pl_PL/readme-EET.html +++ b/EET/lang/pl_PL/readme-EET.html @@ -156,7 +156,7 @@

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 2
+

Wersja 1.0 Release Candidate 4
Dostępne wersje językowe: Angielski, Polski, Niemiecki, Francuski, Hiszpański
Wsparcie dla systemów operacyjnych: Windows, Mac OS X

@@ -224,7 +224,7 @@

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ązanej z kolejnością instalacji i kompatybilnością modów.

-

EET Core Component (setup-EET)

+

Inicjacja instalacji EET (setup-EET)

Podstawowy komponent EET (setup-EET) wymaga świeżej, "czystej" instalacji gry BG2:EE (wymagany patch v2.3.67.3). Mody takie jak tłumaczenia i dubbing w niczym nie przeszkadzają, jednak instalacja innych modów (zwłaszcza większych, modyfikujących oryginalne zasoby) nie jest wskazana, bo może się to skończyć problemami podczas instalacji EET.

@@ -244,7 +244,7 @@

EET Core Component (setup-EET)

To jeszcze nie koniec procesu instalacji EET - przeczytaj poniższą sekcję.

-

EET End Installation Components (setup-EET_end)

+

Zwieńczenie instalacji EET (setup-EET_end)

Po instalacji głównego komponentu w folderze z grą znajdziesz dodatkowy plik setup-EET_end.exe. Dwa pierwsze komponenty (aktualizacja zapisów gry z poprzedniej instalacji oraz zmiana GUI) oferowane przez ten instalator są opcjonalne. Trzeci komponent jest WYMAGANY i powinien on zostać zainstalowany NA SAMYM KOŃCU, po instalacji wszystkich innych modów.

@@ -252,9 +252,9 @@

EET End Installation Components (setup-EET_end)

W skład setup-EET_end wchodzą 3 komponenty:

Jeśli po zakończonej instalacji komponentów zmienisz zdanie i postanowisz doinstalować jakieś mody, to wpierw uruchom setup-EET_end.exe, i odinstaluj ostatni komponent. Gdy będziesz już zadowolony z doboru modów zainstaluj go ponownie.

@@ -263,7 +263,7 @@

Automatyczna instalacja (dla wyjadaczy)

Po rozpakowaniu archiwum, zamiast uruchamiać plik setup, otwórz wiersz poleceń, przejdź do folderu z BG2:EE, i odpal instalatory wykorzystując kod wiersza poleceń, tak jak opisano poniżej. Szybciej jednak będzie wkleić kod wiersza poleceń do pliku z rozszerzeniem BAT i odpalić go zamiast instalatora.

-

EET Core Component (setup-EET)

+

Inicjacja instalacji EET (setup-EET)

setup-EET.exe --force-install 0 --skip-at-view --language X --args-list [flags] [path]

@@ -312,7 +312,7 @@

Automatyczna instalacja (dla wyjadaczy)

-

EET End Installation Components (setup-EET_end)

+

Zwieńczenie instalacji EET (setup-EET_end)

setup-EET_end.exe --force-install-list [numbers] --language X

@@ -335,9 +335,9 @@

Automatyczna instalacja (dla wyjadaczy)

[numbers] -

0 - Update old saves to work with new installation
- 1 - Alternative GUI (SoD)
- 2 - Last component in install order (required before starting the game)

+

0 - Aktualizacja starych zapisów gry dla obecnej instalacji
+ 1 - Alternatywne GUI (SoD)
+ 2 - Zwieńczenie instalacji EET (ostatni mod w kolejności instalacji)

@@ -378,11 +378,10 @@

Jak rozpocząć grę?

Jakie są różnice pomiędzy EET a grą Baldur's Gate: Enhanced Edition?

-

Z punktu widzenia gracza brak znaczących różnic. Od strony technicznej jest trochę zmian mających na celu usunięcie konfliktów pomiędzy zasobami BG1 i BG2, jednak nie powinno to być w żaden sposób zauważalne podczas gry. Jedyne, co mi przychodzi na myśl, to różnica w sposobie implementacji kryzysu żelaza na Wybrzeżu Mieczy. Zamiast 1% szansy na strzaskanie normalnej broni podczas BG1, EET rozszerzył tę funkcjonalność na bronie (0.5%), zbroje (0.2%), tarcze (0.2%) i hełmy (0.1%). Sam kryzys żelaza dotknie nie tylko drużynę gracza, ale i przeciwników. Taki sposób implementacji można uznać za przywrócenie planowanej funkcjonalności (na to wskazują istniejące BAMy dla innych typów zniszczonych przedmiotów i ustawione flagi w plikach ITM), jednak zwolennicy oryginalnych zasad bez trudu mogą przywrócić funkcjonalność znaną z BG1 instalując odpowiedni komponent modu EET Tweaks. Oprócz tego zmieniona została mapa świata. Gra nie kończy się oczywiście po filmiku końcowym pierwszej części Baldura.

+

Z punktu widzenia gracza brak znaczących różnic. Od strony technicznej jest trochę zmian mających na celu usunięcie konfliktów pomiędzy zasobami BG1 i BG2, jednak nie powinno to być w żaden sposób zauważalne podczas gry. Oprócz tego zmieniona została mapa świata. Gra nie kończy się oczywiście po filmiku wieńczącym pierwszą część Baldura.

Jakie są różnice pomiędzy EET a dodatkiem Siege of Dragonspear?

-

Vanilla SoD blocks access to areas after moving from chapter to chapter which is against EET goals. While this design decision is still true in EET for now we're planning to change it to work more like in BG1 and BG2 (areas remain open in later parts of the story). Other than this planned feature SoD worldmap is already merged with EET Worldmap and after finishing the story you will be automatically migrated into BG2.

Dodatek blokuje dostęp do obszarów przechodząc z rozdziału do rozdziału. Na ten moment nie zostało to jeszcze zmienione, ale wkrótce nie będzie to już miało miejsca w EET. Oprócz tego standardowe płynne przejście pomiędzy grami i zintegrowana mapa świata.

@@ -400,9 +399,9 @@

Jaka powinna być kolejność instalacji modów?

Kolejność instalacji modów z EET wygląda następująco:

  1. Mody instalowane na BG:EE
    2. -
  2. Podstawowy komponent EET (setup-EET) zainstalowany na BG2:EE
    3. +
  3. Inicjacja instalacji EET (setup-EET) zainstalowany na BG2:EE
  4. Mody kompatybilne z EET
    5. -
  5. Trzeci komponent setup-EET_end zamyka instalacjÄ™
    6. +
  6. Zwieńczenie instalacji EET (trzeci komponent setup-EET_end zamykający instalację)
@@ -453,17 +452,21 @@

Rozwiązywanie problemów

Krytyczne problemy w czasie instalacji

-

"(...) BG:EE mod is not recognized by EET, so it can't be installed on BG2:EE"

+

Instalator odrzuca podaną ścieżkę do Baldur's Gate: Enhanced Edition.

+ +

Możliwe że obecna instalacja BG:EE jest uszkodzona (brakujące/uszkodzone pliki) lub używasz wersji SoD kupionej w sklepie GOG lub Steam, bez wcześniejszej instalacji narzędzia modmerge. Weryfikacja poprawności instalacji odbywa się przez sprawdzenie obecności pliku "movies/sodcin05.wbm" w folderze z BG:EE. Spróbuj pobrać/zainstalować Baldur's Gate: Enhanced Edition od nowa. Możesz też spróbować podać ścieżkę do gry z poziomu wiersza poleceń, tak jak wspomniano w sekcji dotyczącej instalacji modu.

+ +

"(...) BG:EE mod is not recognized by EET, so it can't be imported to BG2:EE with EET"

-

Jak wspomniano w FAQ EET ogranicza konwersję zasobów BG:EE do tych pochodzących z oryginalnej gry i modów znajdujących się na liście kompatybilności. Dodawanie nowych modów do tej listy nie wymaga dużo pracy, więc z czasem lista zapewne się powiększy.

+

Jak wspomniano w FAQ EET ogranicza konwersję zasobów BG:EE do tych pochodzących z oryginalnej gry i modów znajdujących się na liście kompatybilności. Dodawanie nowych modów do tej listy nie wymaga dużo pracy, więc z czasem lista zapewne się powiększy.

"TLK for language: (...) not found in BG:EE directory"

Sprawdź czy język (plik TLK) wybrany w czasie instalacji faktycznie znajduje się w folderze z BG:EE.

-

Instalator odrzuca podaną ścieżkę do Baldur's Gate: Enhanced Edition.

+

ERROR: COPY (...) FAILED: cannot open target

-

Możliwe że obecna instalacja BG:EE jest uszkodzona (brakujące/uszkodzone pliki). Spróbuj pobrać/zainstalować Baldur's Gate: Enhanced Edition od nowa. Możesz też spróbować podać ścieżkę do gry z poziomu wiersza poleceń, tak jak wspomniano w sekcji dotyczącej instalacji modu.

+

WeiDU wywala się przy próbie edycji ukrytych plików. Wyłącz atrybut ukrycia plików.

WeiDU stopped the installation because of error.

@@ -492,6 +495,10 @@

Problemy w grze

Jest to znany bug silnika gry. Miejmy nadzieję, że zostanie naprawiony przez Beamdog w następnej aktualizacji gry.

+

Woda w niektórych basenach i fontannach nie jest prawidłowo wyświetlana.

+ +

Problem znany, ale jeszcze nie wypracowaliśmy rozwiązania. Lista znanych miejsc, gdzie szkopuł występuje dostępna w tym poście. Proszę zgłaszać inne obszary z tym problemem.

+

Podziękowania

@@ -500,8 +507,8 @@

Podziękowania

Podziękowania (w kolejności alfabetycznej)

@@ -81,7 +81,7 @@

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.

-

EET Core Component (setup-EET)

+

Initialise EET (setup-EET)

Core EET component requires "clean" BG2:EE installation with latest patch (currently v2.3.67.3). Translations and voice-overs are of course allowed but installing other (especially larger) mods that changes DLG and BCS files, before EET, may cause problems with later patching, so it's better to keep the installation as clean as possible.

@@ -101,7 +101,7 @@

EET Core Component (setup-EET)

This is NOT the end of installation - please read the below section.

-

EET End Installation Components (setup-EET_end)

+

Finalise EET (setup-EET_end)

After the core component is installed, your game folder should then contain additional setup-EET_end.exe file. Only the last setup-EET_end.exe component is REQUIRED. It should be installed AFTER ALL OTHER MODS (at least after any mod that modifies dialogues, so for example EET Tweaks can be installed later, but to be sure always try to keep it at the end of your installation order, even if other readme files says otherwise).

@@ -111,7 +111,7 @@

EET End Installation Components (setup-EET_end)

Once the final EET component is installed and you decide to integrate more mods you can safely uninstall it by running setup-EET_end.exe and than install it again once you are satisfied with your mod selection. No problems with reinstalling it too.

@@ -120,7 +120,7 @@

Auto-installation (for expert users)

Instead of directly starting the installation go to the command line, navigate to your installation directory, and execute installers using the construction below. Alternatively, place the construction in a batch file or the Run... dialog in the Start menu.

-

EET Core Component (setup-EET)

+

Initialise EET (setup-EET)

setup-EET.exe --force-install 0 --skip-at-view --language X --args-list [flags] [path]

@@ -169,7 +169,7 @@

Auto-installation (for expert users)

-

EET End Installation Components (setup-EET_end)

+

Finalise EET (setup-EET_end)

setup-EET_end.exe --force-install-list [number] --language X

@@ -194,7 +194,7 @@

Auto-installation (for expert users)

0 - Update old saves to work with new installation
1 - Alternative GUI (SoD)
- 2 - Last component in install order (required before starting the game)

+ 2 - Finalise EET (last mod in install order)

@@ -206,7 +206,7 @@

Auto-installation (for expert users)

setup-EET_end.exe --force-install-list 1 2 --language 0

-

This construction forces WeiDU to use English language, installs optional GUI switch component and REQUIRED component that finalizes EET installation.

+

This construction forces WeiDU to use English language, installs optional GUI switch component and REQUIRED component that finalises EET installation.

@@ -235,7 +235,7 @@

How to start the game?

What are the differences between EET and the original Baldur's Gate: Enhanced Edition?

-

Nothing significant, at least in the way you're going to experience it. Technically there are some minor adjustments to make the BG1 portion of the game compatible with BG2 resources but it's not something that you will notice in game. The only gameplay difference is the way the Iron Crisis items shattering is handled. Unlike vanilla game, in EET Iron Crisis affects not only normal steel weapons (0.5% chance for each attack in EET, compared to 1% in BG1) but armours (0.2% on hit), shields (0.2%) and helmets (0.1%) too. The effect is true for your party and enemies. It can be considered more a restoration rather than tweak, as from game files it's pretty clear that at least armours and shields were meant to break since they have corresponding flags set and unused icons are present too. If you don't like this feature then install EET Tweaks components that will allow you to make it work exactly as in the vanilla game. Other than this obviously the game won't finish after the BG1 end movie. Whole game is also using a new Worldmap.

+

Nothing significant, at least in the way you're going to experience it. Technically there are some minor adjustments to make the BG1 portion of the game compatible with BG2 resources but it's not something that you will notice in game. Obviously the game won't be over after the BG1 end movie. Whole game is also using a new Worldmap.

What are the differences between EET and the original Siege of Dragonspear expansion?

@@ -256,9 +256,9 @@

What should be the general install order?

The general mod install order looks like this:

  1. Mods installed on BG:EE
    2. -
  2. EET Core component (setup-EET) installed on BG2:EE
    3. +
  3. Initialise EET (setup-EET) installed on BG2:EE
  4. Mods with native EET support installed on top of EET
    5. -
  5. EET End component (third component of setup-EET_end)
    6. +
  6. Finalise EET (third component of setup-EET_end that ends the installation)
@@ -309,7 +309,11 @@

Troubleshooting

Fatal Installation Errors

-

"(...) BG:EE mod is not recognized by EET, so it can't be installed on BG2:EE"

+

I have Baldur's Gate: Enhanced Edition installed, but the installation does not accept the directory that I type in.

+ +

The most likely scenario is that your installation is broken or that you use GOG or Steam version of SoD and didn't use modmerge tool. SoD resources presence is verified with "movies/sodcin05.wbm" file within BG:EE directory. Try reinstalling Baldur's Gate: Enhanced Edition and use the tool. You can also try parsing the BG:EE directory using command line as described in the installation section.

+ +

"(...) BG:EE mod is not recognized by EET, so it can't be imported to BG2:EE with EET"

Due to reasons specified in FAQ, EET limits "on the fly" BG:EE resources conversion to vanilla BG:EE installation and mods listed in the compatibility list. Adding other mods is fast and easy, so the list will grow over time.

@@ -317,9 +321,9 @@

Fatal Installation Errors

Check the selected BG:EE language directory if the TLK file is indeed there

-

I have Baldur's Gate: Enhanced Edition installed, but the installation does not accept the directory that I type in.

+

ERROR: COPY (...) FAILED: cannot open target

-

The most likely scenario is that your installation is broken. Try reinstalling Baldur's Gate: Enhanced Edition. Also you can try parsing the BG:EE directory using command line as described in the installation section.

+

WeiDU fails when trying to modify hidden files. Disable "Hidden" attribute.

WeiDU stopped the installation because of error.

@@ -342,12 +346,16 @@

In-game problems

The game has noticeable lag during Siege of Dragonspear areas with many NPCs.

-

It has been reported that some low end graphic cards (integrated Intel HD3000 for example) are not beefed enough to handle such scenes well when with Linear scaling. It's not related to EET in any way. In order to fix it go to Options -> Graphics and enable "Nearest Neighbour Scaling". Also update your GPU drivers if you don't use latest ones.

+

It has been reported that some low end graphic cards (integrated Intel HD3000 for example) are not beefed enough to handle such scenes well with Linear scaling. It's not related to EET in any way. In order to fix it go to Options -> Graphics and enable "Nearest Neighbour Scaling". Also update your GPU drivers if you don't use latest ones.

Fog effect starts at the top-right of the map and expands in the shape of an anchor.

It's a known engine bug. Hopefully it will be fixed in the next patch.

+

Some areas in BG1 have glitched water overlays.

+ +

We are currently trying to find a solution for this issue. Please check out this post and report your findings.

+

Credits

@@ -357,7 +365,7 @@

Kudos (in alphabetical order)