diff --git a/JA#BGT_AdvPack/Betrayal/setup-Betrayal.tpa b/JA#BGT_AdvPack/Betrayal/setup-Betrayal.tpa index 57a6efbe..56f60357 100644 --- a/JA#BGT_AdvPack/Betrayal/setup-Betrayal.tpa +++ b/JA#BGT_AdvPack/Betrayal/setup-Betrayal.tpa @@ -1,6 +1,6 @@ -///////////////////////////////////////// -// Aldeth's betrayal and reconciliation -///////////////////////////////////////// +////////////////////////////////// +// Aldeth's betrayal and remorse +////////////////////////////////// COPY ~JA#BGT_AdvPack/Betrayal/JA#DEAGB.CRE~ ~override~ diff --git a/JA#BGT_AdvPack/Ignatio_Phleed/setup-Ignatio_Phleed.tpa b/JA#BGT_AdvPack/Ignatio_Phleed/setup-Ignatio_Phleed.tpa index 9e5cf617..1e130bda 100644 --- a/JA#BGT_AdvPack/Ignatio_Phleed/setup-Ignatio_Phleed.tpa +++ b/JA#BGT_AdvPack/Ignatio_Phleed/setup-Ignatio_Phleed.tpa @@ -1,6 +1,6 @@ -///////////////////////////// -// RESTORED: Ignatio Phleed -///////////////////////////// +///////////////////////////////////////////////////// +// RESTORED: Ignatio Phleed - the invitation seller +///////////////////////////////////////////////////// COPY ~JA#BGT_AdvPack/Ignatio_Phleed/JA#IGNAT.CRE~ ~override~ diff --git a/JA#BGT_AdvPack/LawSystem/setup-lawsystem.tpa b/JA#BGT_AdvPack/LawSystem/setup-lawsystem.tpa index 27e8bd44..3a572002 100644 --- a/JA#BGT_AdvPack/LawSystem/setup-lawsystem.tpa +++ b/JA#BGT_AdvPack/LawSystem/setup-lawsystem.tpa @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////////// -// LAW-SYSTEM in FRIENDLY ARM INN, ELFSONG TAVERN, BL. MERMAID and DUKAL PALACE +// LAW SYSTEM in FRIENDLY ARM INN, ELFSONG TAVERN, BL. MERMAID and DUKAL PALACE ///////////////////////////////////////////////////////////////////////////////// diff --git a/JA#BGT_AdvPack/Marl/setup-Marl.tpa b/JA#BGT_AdvPack/Marl/setup-Marl.tpa index e9732649..c19d8fc3 100644 --- a/JA#BGT_AdvPack/Marl/setup-Marl.tpa +++ b/JA#BGT_AdvPack/Marl/setup-Marl.tpa @@ -1,6 +1,6 @@ -/////////////////////////////////// -// RESTORED: Marl (tarvern brawl) -/////////////////////////////////// +////////////////////////////////////////////////////// +// RESTORED: Marl (tarvern brawl in Feldepost's Inn) +////////////////////////////////////////////////////// COPY ~JA#BGT_AdvPack/Marl/JA#GUAB1.CRE~ ~override~ diff --git a/JA#BGT_AdvPack/Merchants_League/setup-Merchants_League.tpa b/JA#BGT_AdvPack/Merchants_League/setup-Merchants_League.tpa index 8de93fae..675a1f9d 100644 --- a/JA#BGT_AdvPack/Merchants_League/setup-Merchants_League.tpa +++ b/JA#BGT_AdvPack/Merchants_League/setup-Merchants_League.tpa @@ -231,15 +231,15 @@ COPY_EXISTING ~%SWBaldursGate_MerchantLeague_L1%.ARE~ ~override~ fj_name = ~Main Ambient~ fj_wav_resref0 = ~AM0704~ END + LPF MUTE_AREA_SONG END END - LPF MUTE_AREA_SONG END BUT_ONLY COPY_EXISTING ~%SWBaldursGate_MerchantLeague_L2%.ARE~ ~override~ LPF ALTER_AREA_ACTOR STR_VAR - dlg_file = ~JA#MLCOK~ actor_name = ~Female Cook~ + dlg_file = ~JA#MLCOK~ END LPF ALTER_AREA_ACTOR INT_VAR @@ -272,8 +272,8 @@ COPY_EXISTING ~%SWBaldursGate_MerchantLeague_L2%.ARE~ ~override~ fj_name = ~Main Ambient~ fj_wav_resref0 = ~AM0704~ END + LPF MUTE_AREA_SONG END END - LPF MUTE_AREA_SONG END BUT_ONLY COPY_EXISTING ~%SWBaldursGate_MerchantLeague_L3%.ARE~ ~override~ @@ -292,8 +292,8 @@ COPY_EXISTING ~%SWBaldursGate_MerchantLeague_L3%.ARE~ ~override~ fj_name = ~Main Ambient~ fj_wav_resref0 = ~AM0704~ END + LPF MUTE_AREA_SONG END END - LPF MUTE_AREA_SONG END BUT_ONLY COPY_EXISTING ~%UlgothsBeard_House2%.ARE~ ~override~ diff --git a/JA#BGT_AdvPack/Ramazith/setup-Ramazith.tpa b/JA#BGT_AdvPack/Ramazith/setup-Ramazith.tpa index 84194b18..28d617ad 100644 --- a/JA#BGT_AdvPack/Ramazith/setup-Ramazith.tpa +++ b/JA#BGT_AdvPack/Ramazith/setup-Ramazith.tpa @@ -1,6 +1,6 @@ -///////////////////// -// Ramazith's Tower -///////////////////// +///////////// +// Ramazith +///////////// COPY ~JA#BGT_AdvPack/Ramazith/JA#GOLC1.CRE~ ~override~ diff --git a/JA#BGT_AdvPack/Setup-JA#BGT_AdvPack.tp2 b/JA#BGT_AdvPack/Setup-JA#BGT_AdvPack.tp2 index 957486ba..7ee34f3b 100644 --- a/JA#BGT_AdvPack/Setup-JA#BGT_AdvPack.tp2 +++ b/JA#BGT_AdvPack/Setup-JA#BGT_AdvPack.tp2 @@ -76,19 +76,19 @@ LANGUAGE ~English~ ///////////////////////////////////////////////////////////////////////////////// -// LAW-SYSTEM in FRIENDLY ARM INN, ELFSONG TAVERN, BL. MERMAID and DUKAL PALACE +// LAW SYSTEM in FRIENDLY ARM INN, ELFSONG TAVERN, BL. MERMAID and DUKAL PALACE ///////////////////////////////////////////////////////////////////////////////// -BEGIN ~Extended Tavern Guard System~ DESIGNATED 1 -LABEL "JA#BGT_AdvPack-Law" +BEGIN ~Extended Law System~ DESIGNATED 1 +LABEL "JA#BGT_AdvPack-Lawsystem" FORBID_COMPONENT ~JA#BGT_AdvPack/Setup-JA#BGT_AdvPack.tp2~ 3 ~This component cannot be installed after "Dukal Palace and Husam Story"~ INCLUDE ~JA#BGT_AdvPack/Lawsystem/setup-lawsystem.tpa~ -///////////////////// -// Ramazith's Tower -///////////////////// +///////////// +// Ramazith +///////////// BEGIN ~Ramazith~ DESIGNATED 2 LABEL "JA#BGT_AdvPack-Ramazith" @@ -248,11 +248,11 @@ LABEL "JA#BGT_AdvPack-nobles" INCLUDE ~JA#BGT_AdvPack/nobles/setup-nobles.tpa~ -///////////////////////////// -// RESTORED: Ignatio Phleed -///////////////////////////// +///////////////////////////////////////////////////// +// RESTORED: Ignatio Phleed - the invitation seller +///////////////////////////////////////////////////// -BEGIN ~Ignatio Phleed~ DESIGNATED 17 +BEGIN ~Ignatio Phleed - the invitation seller~ DESIGNATED 17 LABEL "JA#BGT_AdvPack-Ignatio_Phleed" INCLUDE ~JA#BGT_AdvPack/Ignatio_Phleed/setup-Ignatio_Phleed.tpa~ @@ -272,7 +272,7 @@ INCLUDE ~JA#BGT_AdvPack/Shalasin/setup-Shalasin.tpa~ // RESTORED: Sir Artolas ////////////////////////// -BEGIN ~Artola - Sir Artolas~ DESIGNATED 19 +BEGIN ~Sir Artolas~ DESIGNATED 19 LABEL "JA#BGT_AdvPack-Artolas" INCLUDE ~JA#BGT_AdvPack/Artolas/setup-Artolas.tpa~ @@ -322,11 +322,11 @@ FORBID_FILE ~override/ntkeelor.cre~ ~Keelor & Nasha is already restored by anoth INCLUDE ~JA#BGT_AdvPack/Keelor_Nasha/setup-Keelor_Nasha.tpa~ -/////////////////////////////////// -// RESTORED: Marl (tarvern brawl) -/////////////////////////////////// +////////////////////////////////////////////////////// +// RESTORED: Marl (tarvern brawl in Feldepost's Inn) +////////////////////////////////////////////////////// -BEGIN ~Marl (tarvern brawl)~ DESIGNATED 24 +BEGIN ~Marl (tarvern brawl in Feldepost's Inn)~ DESIGNATED 24 LABEL "JA#BGT_AdvPack-Marl" FORBID_COMPONENT ~bg1npc/bg1npc.tp2~ 10 ~This component cannot be installed after BG1NPC~ @@ -391,6 +391,7 @@ INCLUDE ~JA#BGT_AdvPack/Nashkel/setup-Nashkel.tpa~ BEGIN ~Imoen at Winthrop's inn~ DESIGNATED 30 LABEL "JA#BGT_AdvPack-Imoen_Winthrop" +FORBID_COMPONENT ~candlekeep_revisited/candlekeep_revisited.tp2~ 0 ~This component is not compatible with Candlekeep Revisited~ INCLUDE ~JA#BGT_AdvPack/Imoen_Winthrop/setup-Imoen_Winthrop.tpa~ @@ -541,11 +542,11 @@ FORBID_COMPONENT ~bg1npc/bg1npc.tp2~ 10 ~This component cannot be installed afte INCLUDE ~JA#BGT_AdvPack/Seniyad_Aldeth/setup-Seniyad_Aldeth.tpa~ -///////////////////////////////////////// -// Aldeth's betrayal and reconciliation -///////////////////////////////////////// +////////////////////////////////// +// Aldeth's betrayal and remorse +////////////////////////////////// -BEGIN ~Aldeth's betrayal and reconciliation~ DESIGNATED 45 +BEGIN ~Aldeth's betrayal and remorse~ DESIGNATED 45 LABEL "JA#BGT_AdvPack-Betrayal" INCLUDE ~JA#BGT_AdvPack/Betrayal/setup-Betrayal.tpa~ diff --git a/JA#BGT_AdvPack/languages/english/setup.tra b/JA#BGT_AdvPack/languages/english/setup.tra index 5f54444b..ac57a07f 100644 --- a/JA#BGT_AdvPack/languages/english/setup.tra +++ b/JA#BGT_AdvPack/languages/english/setup.tra @@ -522,7 +522,5 @@ In rare cases, the sea servant turns against the master.~ @2120 = ~Guest~ /* new for v 0.7 */ -@2121 = ~Second meeting and dialogue improvements for Niemain and the Zhentarim~ - @2122 = ~Brown fighting cock~ @2123 = ~White fighting cock~ diff --git a/JA#BGT_AdvPack/languages/german/setup.tra b/JA#BGT_AdvPack/languages/german/setup.tra index 69b4dc0a..74cf4e32 100644 --- a/JA#BGT_AdvPack/languages/german/setup.tra +++ b/JA#BGT_AdvPack/languages/german/setup.tra @@ -523,7 +523,5 @@ In seltenen Fällen wendet sich der Meeresdiener gegen seinen Meister.~ /* new for v 0.7 */ -@2121 = ~Zweites Treffen und Dialogverbesserungen für Niemain und die Zentarim~ - @2122 = ~Brauner Kampfhahn~ @2123 = ~Weißer Kampfhahn~ diff --git a/README.md b/README.md index 4ee8262e..c219a894 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Coded to be compatibile with BGEE, EET and BGT ### List of components -1. Extended Tavern Guard System +1. Extended Law System 2. Ramazith 3. Husam's story line finished 4. Gervisse and Voltine @@ -23,14 +23,14 @@ Coded to be compatibile with BGEE, EET and BGT 14. Suthie & Sthief at Silence's Store 15. Warehouse Workers 16. Nobles -17. Ignatio Phleed +17. Ignatio Phleed - the invitation seller 18. Shalasin -19. Artola - Sir Artolas +19. Sir Artolas 20. Pilar & Gheldehar 21. Llindellyn - the archer 22. Mal-Kalen - Ulcaster's Adept 23. Keelor & Nasha -24. Marl (tarvern brawl) +24. Marl (tarvern brawl in Feldepost's Inn) 25. Rythe's Last Arrow 26. Counting House 27. Merchants' League investigations @@ -51,7 +51,7 @@ Coded to be compatibile with BGEE, EET and BGT 42. Jopi and his uncle Ragefast 43. Yuxi: An imp for Ragefast 44. Seniyad & Aldeth -45. Aldeth's betrayal and reconciliation +45. Aldeth's betrayal and remorse 46. Tenya quest in Temple of Umberlee 47. Caldo can be charmed 48. Yago's guard in Low Lantern