From 85cc9d43efa0eee1c3b4b4fdd7abbc999a11fed5 Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Sun, 29 Sep 2024 15:14:09 +0100
Subject: [PATCH] data: adjust extra head mesh for braid

This makes Lara's head in the T-rex death animation match the braid,
similar to her normal head edits.

Resolves #1549.
---
 CHANGELOG.md                               |   1 +
 GAMEFLOW.md                                |   9 +++++++--
 data/ship/cfg/TR1X_gameflow.json5          |   1 +
 data/ship/data/injections/braid_valley.bin | Bin 0 -> 1028 bytes
 subprojects/libtrx                         |   2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 data/ship/data/injections/braid_valley.bin

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75672a7c1..290315ae6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - fixed main menu music volume when exiting while underwater with certain music settings (#1540, regression from 4.4)
 - fixed `/kill` command unable to target a special object
 - fixed really fast typing in console sometimes losing the first input (regression from 4.4)
+- fixed Lara's head not matching the braid if in use when she is killed by the T-rex (#1549)
 - improved object name matching in console commands to work like TR2X
 
 ## [4.4](https://github.com/LostArtefacts/TR1X/compare/4.3-102-g458cd96...4.4) - 2024-09-20
diff --git a/GAMEFLOW.md b/GAMEFLOW.md
index e3459cf7e..a9cdad2dd 100644
--- a/GAMEFLOW.md
+++ b/GAMEFLOW.md
@@ -1371,12 +1371,12 @@ provided with the game achieves.
     <td>
       <code>braid.bin</code>
     </td>
-    <td rowspan="3">
+    <td rowspan="4">
       Injects a braid when the option for it is enabled. This also edits Lara's
       head meshes (object 0 and object 4) to make the braid fit better. A golden
       braid is also provided for the Midas Touch animation. Again, different
       files are needed to cater for mesh differences between cutscene and normal
-      levels.
+      levels. The Lost Valley file comprises a head mesh edit for object 5 only.
     </td>
   </tr>
   <tr valign="top">
@@ -1389,6 +1389,11 @@ provided with the game achieves.
       <code>braid_cut2_cut4.bin</code>
     </td>
   </tr>
+  <tr valign="top">
+    <td>
+      <code>braid_valley.bin</code>
+    </td>
+  </tr>
   <tr valign="top">
     <td>
       <code>cistern_plants.bin</code>
diff --git a/data/ship/cfg/TR1X_gameflow.json5 b/data/ship/cfg/TR1X_gameflow.json5
index ab5dadc02..4f253c58e 100644
--- a/data/ship/cfg/TR1X_gameflow.json5
+++ b/data/ship/cfg/TR1X_gameflow.json5
@@ -108,6 +108,7 @@
             "type": "normal",
             "music": 57,
             "injections": [
+                "data/injections/braid_valley.bin",
                 "data/injections/valley_itemrots.bin",
                 "data/injections/valley_skybox.bin",
                 "data/injections/valley_textures.bin",
diff --git a/data/ship/data/injections/braid_valley.bin b/data/ship/data/injections/braid_valley.bin
new file mode 100644
index 0000000000000000000000000000000000000000..740bc7475c32ab46ce6fc5ae8986de492b998703
GIT binary patch
literal 1028
zcmWGB^!4IkU|?VbVoCuMr3Q@Z9}R(F90IIBzwsgY50qc_BJr8Q@&XKkU{O|Ro&@P)
yW>95NV^C+%0J0bubb<K8e+C8}D6I{pK`PmS7#XktIZ|K&9tLSBEd!-xp)>$)e+rWT

literal 0
HcmV?d00001

diff --git a/subprojects/libtrx b/subprojects/libtrx
index 3e5142253..e1d12599c 160000
--- a/subprojects/libtrx
+++ b/subprojects/libtrx
@@ -1 +1 @@
-Subproject commit 3e51422534f81fcc3178bb9516567ed0b15b8618
+Subproject commit e1d12599cac2d06331d13f3758e763b8588904e1