Merge pull request #7 from Gitjas/master

update to v6.1
Gibberlings3 · Dec 18, 2020 · 581dc2f · 581dc2f
2 parents af1a9b1 + 6c4746e
commit 581dc2f
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 19 deletions.
diff --git a/c#endlessbg1/c#endlessbg1.ini b/c#endlessbg1/c#endlessbg1.ini
@@ -36,4 +36,6 @@ Download = https://github.com/Gibberlings3/EndlessBG1
 
 Type = Tweak_early
 
-Before = EET_End, NPC, transitions
+Before = atweaks, cdtweaks, EET_End, NPC, transitions
+
+After = bg2fixpack, EET
diff --git a/c#endlessbg1/c#endlessbg1.tp2 b/c#endlessbg1/c#endlessbg1.tp2
@@ -8,7 +8,7 @@
 BACKUP ~c#endlessbg1/backup~
 AUTHOR ~https://www.gibberlings3.net/forums/~ //jastey
 
-VERSION ~6~
+VERSION ~6.1~
 
 README ~c#endlessbg1/readme.c#endlessbg1.%LANGUAGE%.txt~ ~c#endlessbg1/readme.c#endlessbg1.english.txt~
 

diff --git a/c#endlessbg1/ffhealer/ffhealer.tpa b/c#endlessbg1/ffhealer/ffhealer.tpa
@@ -12,16 +12,16 @@ END
 COMPILE EVALUATE_BUFFER ~.../c#stsdpr.baf~
 
 COPY ~c#endlessbg1/ffhealer/c#stsdpr.cre~ ~override/c#stsdpr.cre~
-    SAY NAME1 ~Flaming Fist Healer~
-    SAY NAME2 ~Flaming Fist Healer~
+    SAY NAME1 @22 // ~Flaming Fist Healer~
+    SAY NAME2 @22 // ~Flaming Fist Healer~
     WRITE_ASCII 0x280 ~c#stsdpr~ #32 // set DV
     WRITE_ASCII 0x2cc ~c#stsdpr~ #8   // dialogue
   WRITE_EVALUATED_ASCII 0x250 ~c#stsdpr~ #8   // class script
   WRITE_EVALUATED_ASCII 0x260 ~WTASIGHT~ #8   // general script
 
 COPY ~c#endlessbg1/ffhealer/c#stsdpr.cre~ ~override/c#stsdp2.cre~
-    SAY NAME1 ~Flaming Fist Scout~
-    SAY NAME2 ~Flaming Fist Scout~
+    SAY NAME1 @23 // ~Flaming Fist Scout~
+    SAY NAME2 @23 // ~Flaming Fist Scout~
     WRITE_ASCII 0x280 ~c#stsdp2~ #32 // set DV
     WRITE_ASCII 0x2cc ~c#stsdp2~ #8   // dialogue
   WRITE_EVALUATED_ASCII 0x250 ~~ #8   // class script

diff --git a/c#endlessbg1/readme.c#endlessbg1.english.txt b/c#endlessbg1/readme.c#endlessbg1.english.txt
@@ -215,6 +215,10 @@ Spellhold Studios			http://www.shsforums.net/
 
 HISTORY
 
+Version 6.1:
+-Lines in ffhealer.tpa and refugees_sod.tpa traified. Russian text by yota13.
+-added install order syntax to support Project Infinity
+
 Version 6:
 -compatibility with Transitions beta 0.4
 

diff --git a/c#endlessbg1/readme.c#endlessbg1.german.txt b/c#endlessbg1/readme.c#endlessbg1.german.txt
@@ -205,6 +205,10 @@ Spellhold Studios			http://www.shsforums.net/
 
 HISTORY
 
+Version 6.1:
+-Lines in ffhealer.tpa and refugees_sod.tpa traified. Russian text by yota13.
+-added install order syntax to support Project Infinity
+
 Version 6:
 -compatibility with Transitions beta 0.4
 

diff --git a/c#endlessbg1/refugees_sod/refugees_sod.tpa b/c#endlessbg1/refugees_sod/refugees_sod.tpa
@@ -1,42 +1,42 @@
 
 /* refugees arrive in the city (SoD only) */
 COPY_EXISTING ~FTOBE2.cre~ ~override/c#strfg1.cre~
-    SAY NAME1 ~Refugee~ /* female*/
-    SAY NAME2 ~Refugee~ /* female*/
+    SAY NAME1 @20 // ~Refugee~ /* female*/
+    SAY NAME2 @20 // ~Refugee~ /* female*/
     WRITE_ASCII 0x280 ~c#strfg1~ #32 // set DV
     WRITE_ASCII 0x2cc ~c#strfg1~ #8 // set dialogue file
     WRITE_EVALUATED_ASCII 0x268 ~~ #8   // Default script
 
 COPY_EXISTING ~FTOBE5.cre~ ~override/c#strfg2.cre~
-    SAY NAME1 ~Refugee~ /* female*/
-    SAY NAME2 ~Refugee~ /* female*/
+    SAY NAME1 @20 // ~Refugee~ /* female*/
+    SAY NAME2 @20 // ~Refugee~ /* female*/
     WRITE_ASCII 0x280 ~c#strfg2~ #32 // set DV
     WRITE_ASCII 0x2cc ~c#strfg1~ #8 // set dialogue file
     WRITE_EVALUATED_ASCII 0x268 ~~ #8   // Default script
 
 COPY_EXISTING ~MTBE3.cre~ ~override/c#strfg3.cre~
-    SAY NAME1 ~Refugee~ /* male*/
-    SAY NAME2 ~Refugee~ /* male*/
+    SAY NAME1 @21 // ~Refugee~ /* male*/
+    SAY NAME2 @21 // ~Refugee~ /* male*/
     WRITE_ASCII 0x280 ~c#strfg3~ #32 // set DV
     WRITE_ASCII 0x2cc ~c#strfg1~ #8 // set dialogue file
     WRITE_EVALUATED_ASCII 0x260 ~~ #8   // General script
 
 COPY_EXISTING ~MTBE4.cre~ ~override/c#strfg4.cre~
-    SAY NAME1 ~Refugee~ /* male*/
-    SAY NAME2 ~Refugee~ /* male*/
+    SAY NAME1 @21 // ~Refugee~ /* male*/
+    SAY NAME2 @21 // ~Refugee~ /* male*/
     WRITE_ASCII 0x280 ~c#strfg4~ #32 // set DV
     WRITE_ASCII 0x2cc ~c#strfg1~ #8 // set dialogue file
 
 COPY_EXISTING ~BOYBA1.cre~ ~override/c#strfg5.cre~
-    SAY NAME1 ~Refugee~ /* male*/
-    SAY NAME2 ~Refugee~ /* male*/
+    SAY NAME1 @21 // ~Refugee~ /* male*/
+    SAY NAME2 @21 // ~Refugee~ /* male*/
     WRITE_ASCII 0x280 ~c#strfg5~ #32 // set DV
     WRITE_ASCII 0x2cc ~c#strfg5~ #8 // set dialogue file
     WRITE_EVALUATED_ASCII 0x268 ~~ #8   // Default script
 
 COPY_EXISTING ~GIRBA1.cre~ ~override/c#strfg6.cre~
-    SAY NAME1 ~Refugee~ /* female*/
-    SAY NAME2 ~Refugee~ /* female*/
+    SAY NAME1 @20 // ~Refugee~ /* female*/
+    SAY NAME2 @20 // ~Refugee~ /* female*/
     WRITE_ASCII 0x280 ~c#strfg6~ #32 // set DV
     WRITE_ASCII 0x2cc ~c#strfg5~ #8 // set dialogue file
     WRITE_EVALUATED_ASCII 0x268 ~~ #8   // Default script

diff --git a/c#endlessbg1/translations/english/GAME.TRA b/c#endlessbg1/translations/english/GAME.TRA
@@ -73,3 +73,9 @@ Thief~
 //#9855 changed
 @17 = ~It's spreading like wildfire! Everyone's talking about what happened at the palace. From what I've heard, that Sarevok fellow wasn't as noble as he'd like us all to believe. He tried to have the other Dukes killed, so that he could take over the city.~
 
+/* new for v7 */
+@20 = ~Refugee~ /* female*/
+@21 = ~Refugee~ /* male*/
+@22 = ~Flaming Fist Healer~ /* male*/
+@23 = ~Flaming Fist Scout~ /* male*/
+
diff --git a/c#endlessbg1/translations/german/GAME.TRA b/c#endlessbg1/translations/german/GAME.TRA
@@ -86,3 +86,10 @@ Dieben~
 @16 = ~Seid Ihr nicht <CHARNAME>? Ihr und Eure Begleiter passen wirklich genau auf die Beschreibung. In diesem Fall m�chte ich Euch im Auftrag aller, die ich kenne, f�r das danken, was Ihr getan habt. W�rt Ihr nicht so heldenhaft aufgetreten ... Oh, ich mag gar nicht dran denken, wie ein Krieg gegen Amn ausgegangen w�re. Habt Dank, dass Ihr diesem Unruhestifter Sarevok ein Ende bereitet habt!~
 //#9855 changed
 @17 = ~Es breitet sich wie ein Lauffeuer aus! Alle reden davon, was im Palast geschehen ist. Es wird gesagt, dass dieser Sarevok doch nicht so edel war, wie er uns glauben machen wollte. Er hat versucht, die anderen Herz�ge zu t�ten, um die Herrschaft �ber die Stadt an sich zu rei�en.~
+
+
+/* new for v7 */
+@20 = ~Fl�chtling~ /* female*/
+@21 = ~Fl�chtling~ /* male*/
+@22 = ~Heiler der Flammenden Faust~ /* male*/
+@23 = ~Sp�her der Flammenden Faust~ /* male*/
diff --git a/c#endlessbg1/translations/russian/GAME.TRA b/c#endlessbg1/translations/russian/GAME.TRA
@@ -84,4 +84,12 @@
 //#9854 changed
 @16 = ~�� ���� <CHARNAME>, �����? �� �������� ��������� ��� ��������. �� ����� ����, ���� � ����, ���� ������������� �� ���, ��� ���� ������� ��� ��� �������. ���� �� �� ���� �������... �� � ���������� �� ����� ���� �����, ��� ���� �� �� ����� ����, ��������� ��� ����� � �����. ������� ���� �� ��, ��� ������� ��� ������ � ��� ���������� ������� �����!~
 //#9855 changed
-@17 = ~����� ����������� ������� �����! ��� ������ � ������� � ���, ��� ��������� �� ������. �������, ������� ��� ����� �� ����� ����������, ��� �� ������� ��� ��������. �� ��������� ���������� ���������� ��������, ����� ���������� ��������� ������ � ������.~
+@17 = ~����� ����������� ������� �����! ��� ������ � ������� � ���, ��� ��������� �� ������. �������, ������� ��� ����� �� ����� ����������, ��� �� ������� ��� ��������. �� ��������� ���������� ���������� ��������, ����� ���������� ��������� ������ � ������.~
+
+
+/* new for v7 */
+@20 = ~�������~ /* female*/
+@21 = ~�������~ /* male*/
+@22 = ~�������� ���������� ������~ /* male*/
+@23 = ~��������� ���������� ������~ /* male*/
+