Version 1.0 Release Candidate 4

- fixed glitched water overlays (by argent77). Please let us know if you find more areas with this issue - fixed NPC continuity (in old versions there may be problems with disabling old NPCs when you come back to area that has NPC which never joined the party - problem caused by NPCLEVEL.2DA variants) - fixed incorrect strref used for chapter 20 in GUI Journal screen - fixed RC3 regression regarding BG1 Player1 starting weapon - class text 2da rows normalized during final patching to always use 10 columns - worldmap is now generated using BP-BGT Worldmap code (which fixes problem with "Destination Unreachable" string shown on unvisited worldmap areas with blank TLK entries) - altered strings related to worldmap (Destination Unreachable -> Unreachable; Traveling Hours -> Hours) - restored SoD extended ending (for some reason Beamdog cut out playable part of the final scene)
Gibberlings3 · Aug 3, 2016 · 2961c27 · 2961c27
1 parent a756d3b
commit 2961c27
Show file tree

Hide file tree

Showing 33 changed files with 865 additions and 1,561 deletions.
diff --git 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
@@ -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
@@ -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 → EET/base/movies/CREDITS.wbm b/EET/base/movies/CREDITS_.wbm → EET/base/movies/CREDITS.wbm
diff --git a/EET/base/spl/K#REST.SPL b/EET/base/spl/K#REST.SPL
diff --git a/EET/base/spl/K#UNREST.SPL b/EET/base/spl/K#UNREST.SPL
diff --git a/EET/base/worldmap.wmp b/EET/base/worldmap.wmp
diff --git a/EET/compile/baf/BG0000.baf b/EET/compile/baf/BG0000.baf
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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~