Merge pull request #1 from GraionDilach/graion-reviews

Stuff I polished.

BG1Aerie/Readme-BG1Aerie.txt

@@ -8,11 +8,11 @@ If you already know her from BG2, then you already know where you're most likely
 
 To install:
 
-Simply unrar to your game directory (For me its C:\Program Files (x86)\BeamDog\Games\00766\), and then double click the file �setup-BG1Aerie.exe�, and follow the instructions.
+Simply unrar to your game directory (For me its C:\Program Files (x86)\BeamDog\Games\00766\), and then double click the file �setup-BG1Aerie.exe�, and follow the instructions.
 
-To uninstall, just double click setup-TenyaThermidor.exe again.
+To uninstall, just double click setup-BG1Aerie.exe again.
 
-Version 1.2
+Version 2.0
 
 - Add French translation by Spartan117
 - Add french audio
@@ -24,3 +24,12 @@ Version 1.2
 - Add REQUIRE_PREDICATE GAME_IS bgee eet
 - Add metadata and label for Project Infinity
 - Correct B2#Aeri.d Imoen dialogue for EET thanks to Jastey and Camdawg
+
+Version 2.1
+
+- Further EET compatibility fixes, thanks to argent77 pointing out the issue.
+
+Version NEXT_VERSION
+
+- Fix BGEE audio slot misassignment.
+- Use the original BG2 portrait as default and separate out the mod-included lighter portrait variant to a component. (Previous setup also affected her portrait in BG2.)

BG1Aerie/setup-BG1Aerie.tp2

@@ -28,7 +28,7 @@ LANGUAGE
          ~english~
          ~BG1Aerie/tra/english/B1Asetup.tra~
 LANGUAGE 		 
-		 ~Russian (Alisia & Arcanecoast.ru)~
+         ~Russian (Alisia & Arcanecoast.ru)~
          ~russian~
          ~BG1Aerie/tra/russian/B1Asetup.tra~
 LANGUAGE 
@@ -42,6 +42,33 @@ DESIGNATED 5000
 LABEL ~Coutelier-AerieBG1~
 REQUIRE_PREDICATE GAME_IS ~bgee eet~ @6000
 
+// Update CRE audio references for EET compatibility
+
+DEFINE_PATCH_MACRO patch_eet_audio BEGIN
+  PATCH_IF (GAME_IS ~eet~) BEGIN
+    // add 200000 as per EET BG1 TLK references
+    FOR (n = 0; n < 100; ++n) BEGIN
+      READ_LONG 0xA4 + n*4 temp_str
+      PATCH_IF (temp_str > 0) BEGIN
+        WRITE_LONG 0xA4 + n*4 (200000 + temp_str)
+      END
+    END
+    // move the nine-click RARE_SELECT audio to the BG2EE slots
+    READ_LONG SELECT_ACTION4 rareselect1
+    READ_LONG SELECT_ACTION5 rareselect2
+    READ_LONG SELECT_ACTION6 rareselect3
+    READ_LONG SELECT_ACTION7 rareselect4
+    WRITE_LONG SELECT_ACTION4 (BNOT 0x0)
+    WRITE_LONG SELECT_ACTION5 (BNOT 0x0)
+    WRITE_LONG SELECT_ACTION6 (BNOT 0x0)
+    WRITE_LONG SELECT_ACTION7 (BNOT 0x0)
+    WRITE_LONG 0x1D0 rareselect1 /* BG2EE_SELECT_RARE1 */
+    WRITE_LONG 0x1D4 rareselect2 /* BG2EE_SELECT_RARE2 */
+    WRITE_LONG 0x1D8 rareselect3 /* BG2EE_SELECT_RARE3 */
+    WRITE_LONG 0x1DC rareselect4 /* BG2EE_SELECT_RARE4 */
+  END
+END
+
 // Audio
 
 ACTION_IF DIRECTORY_EXISTS ~BG1Aerie/tra/%LANGUAGE%/audio~ THEN BEGIN
@@ -78,7 +105,11 @@ COMPILE ~BG1Aerie/Scripts/B2#cAAM5.baf~
 
 // Copying files
 COPY ~BG1Aerie/shop~ ~override~
-COPY ~BG1Aerie/portraits~ ~override~
+
+// Install the vanilla portrait if it's missing from the game
+ACTION_IF (NOT FILE_EXISTS_IN_GAME ~NAERIEL.BMP~) BEGIN
+  COPY ~BG1Aerie/portraitsBGEE~ ~override~
+END
 
 // Items
 COPY ~BG1Aerie/items/B2#RNG1.itm~ ~override~
@@ -94,16 +125,21 @@ COPY ~BG1Aerie/items/B2#BTSA.itm~ ~override~
 
 // Creatures
 COPY ~BG1Aerie/creatures/B2#Ashur.cre~ ~override/B2#Ashur.cre~
+  LPM patch_eet_audio
   SAY NAME1 @6
   SAY NAME2 @6
 COPY ~BG1Aerie/creatures/B2#Kyte.cre~ ~override/B2#Kyte.cre~
+  LPM patch_eet_audio
   SAY NAME1 @7
   SAY NAME2 @7
 COPY ~BG1Aerie/creatures/B2#Tello.cre~ ~override/B2#Tello.cre~
+  LPM patch_eet_audio
   SAY NAME1 @8
   SAY NAME2 @8
 COPY ~BG1Aerie/creatures/B2#Band1.cre~ ~override/B2#Band1.cre~
+  LPM patch_eet_audio
 COPY ~BG1Aerie/creatures/B2#Band2.cre~ ~override/B2#Band2.cre~
+  LPM patch_eet_audio
 COPY ~BG1Aerie/creatures/B2#Aeri2.cre~ ~override/B2#Aeri2.cre~
   SAY NAME1 @4
   SAY NAME2 @4
@@ -139,10 +175,7 @@ COPY ~BG1Aerie/creatures/B2#Aeri2.cre~ ~override/B2#Aeri2.cre~
   SAY SELECT_ACTION1 @5021 /* Faster than Chiktikka Fastpaws! */
   SAY SELECT_ACTION2 @5022 /* I'll do it! */
   SAY SELECT_ACTION3 @5023 /* In Baervan's name, it shall be done. */
-  SAY SELECT_ACTION4 @5024 /* Must I? */
-  SAY SELECT_ACTION5 @5025 /* If... i-if you're sure. */
-  SAY SELECT_ACTION6 @5026 /*  */
-  WRITE_LONG SELECT_ACTION7 (BNOT 0x0)
+  WRITE_LONG SELECT_ACTION7 (BNOT 0x0) /* empty, doesn't need special treatment, see below */
   SAY CRITICAL_HIT @5027 /* Oh, my... */
   SAY CRITICAL_MISS @5028 /*  */
   SAY TARGET_IMMUNE @5029 /* My weapon does nothing! */
@@ -153,8 +186,22 @@ COPY ~BG1Aerie/creatures/B2#Aeri2.cre~ ~override/B2#Aeri2.cre~
   WRITE_LONG SET_A_TRAP (BNOT 0x0)
   WRITE_LONG HIDDEN_IN_SHADOWS (BNOT 0x0)
   WRITE_LONG PICKED_POCKET (BNOT 0x0)
+  // SELECT_ACTION4-7 needs special treatment, they are the 4-click funny response slots on BGEE and only action response slots on BG2EE
+  PATCH_IF (GAME_IS ~eet~) BEGIN
+    SAY SELECT_ACTION4 @5024 /* Must I? */
+    SAY SELECT_ACTION5 @5025 /* If... i-if you're sure. */
+    SAY SELECT_ACTION6 @5026 /*  */
+  END ELSE BEGIN
+    WRITE_LONG SELECT_ACTION4 (BNOT 0x0)
+    WRITE_LONG SELECT_ACTION5 (BNOT 0x0)
+    WRITE_LONG SELECT_ACTION6 (BNOT 0x0)
+    SAY 0x1E0 @5024			/* Must I? */	/* SAY BGEE_ACTION4 */
+    SAY 0x1E4 @5025			/* If... i-if you're sure. */		/* SAY BGEE_ACTION5 */
+    SAY 0x1E8 @5026			/*  */				/* SAY BGEE_ACTION6 */
+  END
 
 COPY ~BG1Aerie/creatures/B2#KOBCM.cre~ ~override/B2#KOBCM.cre~
+  LPM patch_eet_audio
 COPY ~BG1Aerie/creatures/B2#Aeri.cre~ ~override/B2#Aeri.cre~
   SAY NAME1 @4
   SAY NAME2 @4
@@ -191,10 +238,7 @@ COPY ~BG1Aerie/creatures/B2#Aeri.cre~ ~override/B2#Aeri.cre~
   SAY SELECT_ACTION1 @5021 /* Faster than Chiktikka Fastpaws! */
   SAY SELECT_ACTION2 @5022 /* I'll do it! */
   SAY SELECT_ACTION3 @5023 /* In Baervan's name, it shall be done. */
-  SAY SELECT_ACTION4 @5024 /* Must I? */
-  SAY SELECT_ACTION5 @5025 /* If... i-if you're sure. */
-  SAY SELECT_ACTION6 @5026 /*  */
-  WRITE_LONG SELECT_ACTION7 (BNOT 0x0)
+  WRITE_LONG SELECT_ACTION7 (BNOT 0x0) /* empty, doesn't need special treatment, see below */
   SAY CRITICAL_HIT @5027 /* Oh, my... */
   SAY CRITICAL_MISS @5028 /*  */
   SAY TARGET_IMMUNE @5029 /* My weapon does nothing! */
@@ -205,7 +249,32 @@ COPY ~BG1Aerie/creatures/B2#Aeri.cre~ ~override/B2#Aeri.cre~
   WRITE_LONG SET_A_TRAP (BNOT 0x0)
   WRITE_LONG HIDDEN_IN_SHADOWS (BNOT 0x0)
   WRITE_LONG PICKED_POCKET (BNOT 0x0)
+  // SELECT_ACTION4-7 needs special treatment, they are the 4-click funny response slots on BGEE and only action response slots on BG2EE
+  PATCH_IF (GAME_IS ~eet~) BEGIN
+    SAY SELECT_ACTION4 @5024 /* Must I? */
+    SAY SELECT_ACTION5 @5025 /* If... i-if you're sure. */
+    SAY SELECT_ACTION6 @5026 /*  */
+  END ELSE BEGIN
+    WRITE_LONG SELECT_ACTION4 (BNOT 0x0)
+    WRITE_LONG SELECT_ACTION5 (BNOT 0x0)
+    WRITE_LONG SELECT_ACTION6 (BNOT 0x0)
+    SAY 0x1E0 @5024			/* Must I? */	/* SAY BGEE_ACTION4 */
+    SAY 0x1E4 @5025			/* If... i-if you're sure. */		/* SAY BGEE_ACTION5 */
+    SAY 0x1E8 @5026			/*  */				/* SAY BGEE_ACTION6 */
+  END
 
 // Appends
-APPEND ~pdialog.2da~ ~B2#Aeri  	B2#AeriP  	****  	****  	****  	****  	****  	****~
-  UNLESS ~B2#Aeri~
+ACTION_IF (GAME_IS ~eet~) BEGIN
+  APPEND ~pdialog.2da~ ~B2#Aeri  	B2#AeriP  	****  	****  	****  	****  	****  	****~
+    UNLESS ~B2#Aeri~
+END ELSE BEGIN
+  APPEND ~pdialog.2da~ ~B2#Aeri  	B2#AeriP  	****  	****~
+    UNLESS ~B2#Aeri~
+END
+
+BEGIN @6002 /* Install lighter portrait */
+DESIGNATED 5001
+LABEL ~Coutelier-AerieBG1-Lighter-Portrait~
+REQUIRE_PREDICATE GAME_IS ~bgee eet~ @6000
+
+COPY ~BG1Aerie/portraits~ ~override~

BG1Aerie/tra/english/B1Asetup.tra

@@ -58,3 +58,4 @@ Weight: 4~
 
 @6000 = ~Aerie in BGEE must be installed on BGEE or EET~
 @6001 = ~Modmerge or Argent's DLC Merger is required before mods can be installed on this game.~
+@6002 = ~Install a lighter variant of the portrait for Aerie? (This changes her BG2 portrait as well in EET.)~

BG1Aerie/tra/french/B1Asetup.tra

@@ -58,3 +58,4 @@ Poids: 4~
 
 @6000 = ~Aerie dans BGEE doit être installé sur BGEE ou EET~
 @6001 = ~Modmerge ou DLC Merger d'Argent est necessaire avant que des mods puissent etre installes sur ce jeu.~
+@6002 = ~Install a lighter variant of the portrait for Aerie? (This changes her BG2 portrait as well in EET.)~

BG1Aerie/tra/russian/B1Asetup.tra

@@ -56,4 +56,5 @@
 @5033 = ~А-А-А! ПОМОГИТЕ МНЕ! ПОМОГИТЕ, ПОЖА-А-АЛУЙСТА!~ [B2Aeri95]
 
 @6000 = ~Aerie in BGEE must be installed on BGEE or EET~
-@6001 = ~Modmerge or Argent's DLC Merger is required before mods can be installed on this game.~
+@6001 = ~Modmerge or Argent's DLC Merger is required before mods can be installed on this game.~
+@6002 = ~Install a lighter variant of the portrait for Aerie? (This changes her BG2 portrait as well in EET.)~