From cea07006e5dbe9e5a0c20713b827da41c654106f Mon Sep 17 00:00:00 2001 From: ALIENQuake Date: Fri, 14 Jun 2019 09:39:02 +0200 Subject: [PATCH 1/2] changes required by Project Infinity to detect components --- EET/EET.tp2 | 16 +++++++++------- EET/lang/de_DE/setup.tra | 6 ++++++ EET/lang/en_US/setup.tra | 6 ++++++ EET/lang/es_ES/setup.tra | 6 ++++++ EET/lang/fr_FR/setup.tra | 6 ++++++ EET/lang/pl_PL/setup.tra | 6 ++++++ EET/lib/EET_end.tp2 => EET_End/EET_End.tp2 | 0 EET/lib/EET_gui.tp2 => EET_GUI/EET_GUI.tp2 | 18 ++++++++++++------ 8 files changed, 51 insertions(+), 13 deletions(-) rename EET/lib/EET_end.tp2 => EET_End/EET_End.tp2 (100%) rename EET/lib/EET_gui.tp2 => EET_GUI/EET_GUI.tp2 (73%) diff --git a/EET/EET.tp2 b/EET/EET.tp2 index c6287c77..5769cfd1 100644 --- a/EET/EET.tp2 +++ b/EET/EET.tp2 @@ -752,7 +752,7 @@ COPY_EXISTING ~BGEE.LUA~ ~override~ REPLACE_TEXTUALLY ~{'blackpit',.+[%newline%]*~ ~~ REPLACE_TEXTUALLY ~{'sodcin0[1-3]',.+[%newline%]*~ ~~ REPLACE_TEXTUALLY ~JOURNAL_MODE_EDIT = 3,~ ~JOURNAL_MODE_EDIT = 3, - + START_CAMPAIGN_BG1 = 1, START_CAMPAIGN_SOD = 2, START_CAMPAIGN_SOA = 3, @@ -1742,10 +1742,10 @@ COPY ~%MOD_FOLDER%/base/BALDUR.GAM~ ~override~ WRITE_SHORT ("%npcs_off%" + 0x92) 0xffff WRITE_SHORT ("%npcs_off%" + 0xb4) 0xffff WRITE_SHORT ("%npcs_off%" + 0xb6) 0xffff - WRITE_SHORT ("%npcs_off%" + 0xb8) 0xffff + WRITE_SHORT ("%npcs_off%" + 0xb8) 0xffff END - PATCH_IF ("%cnt%" > 0) BEGIN + PATCH_IF ("%cnt%" > 0) BEGIN SET delta = 0x160 * cnt SET npcs_cnt = npcs_cnt + cnt WRITE_LONG 0x34 "%npcs_cnt%" @@ -2377,7 +2377,7 @@ ACTION_DEFINE_ASSOCIATIVE_ARRAY strref_wmp BEGIN END ACTION_PHP_EACH strref_wmp AS content => strref BEGIN ACTION_IF (strref >= 199000) AND (strref < 200000) BEGIN - ACTION_IF (VARIABLE_IS_SET $fl#NAME("%content%")) AND ($fl#NAME("%content%") STR_CMP "") BEGIN + ACTION_IF (VARIABLE_IS_SET $fl#NAME("%content%")) AND ($fl#NAME("%content%") STR_CMP "") BEGIN OUTER_SPRINT string $fl#NAME("%content%") END ELSE ACTION_IF (VARIABLE_IS_SET $fl#TOOL("%content%")) AND ($fl#TOOL("%content%") STR_CMP "") BEGIN OUTER_SPRINT string $fl#TOOL("%content%") @@ -2417,7 +2417,7 @@ COPY ~%patch_dir%/BGMAP.wmp~ ~override~ ///// Iron Crisis (item shattering) \\\\\ ///// \\\\\ -ACTION_DEFINE_ARRAY eet_ironCrisis_array BEGIN +ACTION_DEFINE_ARRAY eet_ironCrisis_array BEGIN AX1H01.ITM AX1H04.ITM BLUN02.ITM @@ -2657,16 +2657,18 @@ COPY ~.../blank.txt~ ~override/EET.flag~ APPEND ~EET.flag~ ~EET_JOURNAL~ PRINT ~'EET.flag' file is used by WeiDU to recognize the installation as EET~ + ACTION_FOR_EACH file IN EET_end EET_gui BEGIN - COPY + ~%MOD_FOLDER%/lib/%file%.tp2~ ~%file%.tp2~ + //COPY + ~%MOD_FOLDER%/lib/%file%.tp2~ ~%file%.tp2~ ACTION_IF ~%WEIDU_OS%~ STR_EQ ~osx~ BEGIN COPY ~setup-EET.command~ ~setup-%file%.command~ - REPLACE_TEXTUALLY ~EET/EET.tp2 --log SETUP-EET.DEBUG~ ~%file%.tp2 --log SETUP-%file%.DEBUG~ + REPLACE_TEXTUALLY ~EET/EET.tp2 --log SETUP-EET.DEBUG~ ~%file%/%file%.tp2 --log SETUP-%file%.DEBUG~ END ELSE BEGIN COPY ~%weidu%~ ~setup-%file%%exe%~ END END + ACTION_IF (~%argv[0]%~ STRING_CONTAINS_REGEXP ~[Ss]~ = 0) BEGIN PRINT ~Skipping shortcut creation~ END ELSE ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN diff --git a/EET/lang/de_DE/setup.tra b/EET/lang/de_DE/setup.tra index 70cd00f3..353c165c 100644 --- a/EET/lang/de_DE/setup.tra +++ b/EET/lang/de_DE/setup.tra @@ -18,3 +18,9 @@ It is safe to abort this installation by closing this window or pressing Ctrl+C. @910001 = ~This component requires EET core component to be installed first~ @910002 = ~Standard installation~ @910003 = ~Also update saves (no backups, check the readme file)~ + +//setup-EET_GUI +@920000 = ~Siege of Dragonspear~ +@920001 = ~EET alternative GUI~ +@920002 = ~Icewind Dale: Enhanced Edition~ +@920003 = ~This component require EET~ \ No newline at end of file diff --git a/EET/lang/en_US/setup.tra b/EET/lang/en_US/setup.tra index 70cd00f3..353c165c 100644 --- a/EET/lang/en_US/setup.tra +++ b/EET/lang/en_US/setup.tra @@ -18,3 +18,9 @@ It is safe to abort this installation by closing this window or pressing Ctrl+C. @910001 = ~This component requires EET core component to be installed first~ @910002 = ~Standard installation~ @910003 = ~Also update saves (no backups, check the readme file)~ + +//setup-EET_GUI +@920000 = ~Siege of Dragonspear~ +@920001 = ~EET alternative GUI~ +@920002 = ~Icewind Dale: Enhanced Edition~ +@920003 = ~This component require EET~ \ No newline at end of file diff --git a/EET/lang/es_ES/setup.tra b/EET/lang/es_ES/setup.tra index 5de5e8f9..8e753b64 100644 --- a/EET/lang/es_ES/setup.tra +++ b/EET/lang/es_ES/setup.tra @@ -18,3 +18,9 @@ Es seguro cancelar esta instalacion cerrando esta ventana o pulsando Ctrl+C.~ @910001 = ~Este componente requiere el componente principal de EET para ser instalado~ @910002 = ~Standard installation~ @910003 = ~Also update saves (no backups, check the readme file)~ + +//setup-EET_GUI +@920000 = ~Siege of Dragonspear~ +@920001 = ~EET alternative GUI~ +@920002 = ~Icewind Dale: Enhanced Edition~ +@920003 = ~This component require EET~ \ No newline at end of file diff --git a/EET/lang/fr_FR/setup.tra b/EET/lang/fr_FR/setup.tra index 70cd00f3..353c165c 100644 --- a/EET/lang/fr_FR/setup.tra +++ b/EET/lang/fr_FR/setup.tra @@ -18,3 +18,9 @@ It is safe to abort this installation by closing this window or pressing Ctrl+C. @910001 = ~This component requires EET core component to be installed first~ @910002 = ~Standard installation~ @910003 = ~Also update saves (no backups, check the readme file)~ + +//setup-EET_GUI +@920000 = ~Siege of Dragonspear~ +@920001 = ~EET alternative GUI~ +@920002 = ~Icewind Dale: Enhanced Edition~ +@920003 = ~This component require EET~ \ No newline at end of file diff --git a/EET/lang/pl_PL/setup.tra b/EET/lang/pl_PL/setup.tra index f78fea8c..1d6a6fef 100644 --- a/EET/lang/pl_PL/setup.tra +++ b/EET/lang/pl_PL/setup.tra @@ -18,3 +18,9 @@ W razie dalszych problemow mozna zamknac to okno i zakonczyc instalacje skrotem @910001 = ~Komponent wymaga zainstalowania rdzenia EET~ @910002 = ~Standardowa instalacja~ @910003 = ~Instalacja z aktualizacja zapisow gry (bez kopii zapasowej, sprawdz readme)~ + +//setup-EET_GUI +@920000 = ~Siege of Dragonspear~ +@920001 = ~EET alternatywne GUI~ +@920002 = ~Icewind Dale: Enhanced Edition~ +@920003 = ~Komponent wymaga wczesniejszego zainstalowania podstawowego komponentu EET~ \ No newline at end of file diff --git a/EET/lib/EET_end.tp2 b/EET_End/EET_End.tp2 similarity index 100% rename from EET/lib/EET_end.tp2 rename to EET_End/EET_End.tp2 diff --git a/EET/lib/EET_gui.tp2 b/EET_GUI/EET_GUI.tp2 similarity index 73% rename from EET/lib/EET_gui.tp2 rename to EET_GUI/EET_GUI.tp2 index 0d13e214..5d4b7cf9 100644 --- a/EET/lib/EET_gui.tp2 +++ b/EET_GUI/EET_GUI.tp2 @@ -1,15 +1,21 @@ BACKUP ~EET/backup/gui~ AUTHOR ~K4thos (swit)~ -BEGIN ~Siege of Dragonspear~ -SUBCOMPONENT ~EET alternative GUI~ -REQUIRE_COMPONENT ~EET/EET.tp2~ ~0~ ~~ + +LANGUAGE ~English~ + ~en_US~ + ~EET/lang/en_US/prompts.tra~ + ~EET/lang/en_US/setup.tra~ + +BEGIN @920000 +SUBCOMPONENT @920001 +REQUIRE_COMPONENT ~EET/EET.tp2~ ~0~ @920003 COPY ~EET/SoD_GUI~ ~override~ -BEGIN ~Icewind Dale: Enhanced Edition~ -SUBCOMPONENT ~EET alternative GUI~ -REQUIRE_COMPONENT ~IWD-IN-EET/IWD-IN-EET.TP2~ ~0~ ~~ +BEGIN @920002 +SUBCOMPONENT @920001 +REQUIRE_COMPONENT ~IWD-IN-EET/IWD-IN-EET.TP2~ ~0~ @920003 ACTION_FOR_EACH file IN /*CHPTXT0*/ CHPTXT1 CHPTXT2 CHPTXT3 CHPTXT4 CHPTXT5 CHPTXT6 CHPTXT7 CHPTXT8 SODTXT9 SODTXT10 CHPTXT11 CHPTXT12 CHPTXT13 SCENE02 SCENE03 SCENE04 SCRTXT01 SCRTXT02 SCRTXT07 SCRTXT06 SCRTXT08 CHPTXT9 CHPTXT10 /*IDCHP0B IDCHP1B IDCHP2B IDCHP3B IDCHP4B IDCHP5B IDCHP6B IWCHP0B IWCHP1B IWCHP2B IWCHP3B IWCHP4B IWCHP5B IWCHP6B*/ BEGIN COPY_EXISTING ~%file%.2DA~ ~override~ From 375761a0575326c0dbce6f8ee39da2fa65d16ed1 Mon Sep 17 00:00:00 2001 From: ALIENQuake Date: Fri, 14 Jun 2019 09:56:46 +0200 Subject: [PATCH 2/2] match LANGUAGE values with EET.tp2 values --- EET_GUI/EET_GUI.tp2 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/EET_GUI/EET_GUI.tp2 b/EET_GUI/EET_GUI.tp2 index 5d4b7cf9..d0540d02 100644 --- a/EET_GUI/EET_GUI.tp2 +++ b/EET_GUI/EET_GUI.tp2 @@ -6,7 +6,23 @@ LANGUAGE ~English~ ~en_US~ ~EET/lang/en_US/prompts.tra~ ~EET/lang/en_US/setup.tra~ - +LANGUAGE ~Polski (Polish)~ + ~pl_PL~ + ~EET/lang/pl_PL/prompts.tra~ + ~EET/lang/pl_PL/setup.tra~ +LANGUAGE ~Spanish~ + ~es_ES~ + ~EET/lang/es_ES/prompts.tra~ + ~EET/lang/es_ES/setup.tra~ +/*LANGUAGE ~Deutsch (German)~ + ~de_DE~ + ~EET/lang/de_DE/prompts.tra~ + ~EET/lang/de_DE/setup.tra~ +LANGUAGE ~French~ + ~fr_FR~ + ~EET/lang/fr_FR/prompts.tra~ + ~EET/lang/fr_FR/setup.tra~*/ + BEGIN @920000 SUBCOMPONENT @920001 REQUIRE_COMPONENT ~EET/EET.tp2~ ~0~ @920003