tr2/data: fix pickup mesh scaling and rotations

This fixes scaling on various pickup model meshes, and in the case of
the Barkhang prayer wheel, restores base animation data. It also fixes
default rotations on some models so they appear correctly in the
inventory.

Resolves #1831.
Resolves #1832.
Part of #1894.

data/tr2/ship/cfg/TR2X_gameflow.json5

@@ -65,6 +65,7 @@
                 {"type": "level_complete"},
             ],
             "injections": [
+                "data/injections/common_pickup_meshes.bin",
                 "data/injections/wall_itemrots.bin",
             ],
         },
@@ -80,6 +81,9 @@
                 {"type": "level_stats"},
                 {"type": "level_complete"},
             ],
+            "injections": [
+                "data/injections/common_pickup_meshes.bin",
+            ],
         },
 
         // 3. Bartoli's Hideout
@@ -94,6 +98,9 @@
                 {"type": "level_stats"},
                 {"type": "level_complete"},
             ],
+            "injections": [
+                "data/injections/common_pickup_meshes.bin",
+            ],
         },
 
         // 4. Opera House
@@ -110,6 +117,7 @@
                 {"type": "level_complete"},
             ],
             "injections": [
+                "data/injections/common_pickup_meshes.bin",
                 "data/injections/opera_fd.bin",
                 "data/injections/opera_itemrots.bin",
             ],
@@ -132,6 +140,7 @@
             ],
             "injections": [
                 "data/injections/rig_itemrots.bin",
+                "data/injections/rig_pickup_meshes.bin",
             ],
         },
 
@@ -149,6 +158,7 @@
             ],
             "injections": [
                 "data/injections/diving_itemrots.bin",
+                "data/injections/diving_pickup_meshes.bin",
             ],
         },
 
@@ -165,6 +175,7 @@
                 {"type": "level_complete"},
             ],
             "injections": [
+                "data/injections/common_pickup_meshes.bin",
                 "data/injections/fathoms_goon_sfx.bin",
             ],
         },
@@ -185,6 +196,7 @@
                 "data/injections/wreck_fd.bin",
                 "data/injections/wreck_goon_sfx.bin",
                 "data/injections/wreck_itemrots.bin",
+                "data/injections/wreck_pickup_meshes.bin",
             ],
         },
 
@@ -201,6 +213,7 @@
             ],
             "injections": [
                 "data/injections/living_deck_goon_sfx.bin",
+                "data/injections/living_pickup_meshes.bin",
                 "data/injections/seaweed_collision.bin",
             ],
         },
@@ -218,6 +231,7 @@
             ],
             "injections": [
                 "data/injections/deck_itemrots.bin",
+                "data/injections/deck_pickup_meshes.bin",
                 "data/injections/living_deck_goon_sfx.bin",
             ],
         },
@@ -236,6 +250,7 @@
                 {"type": "level_complete"},
             ],
             "injections": [
+                "data/injections/common_pickup_meshes.bin",
                 "data/injections/tibet_fd.bin",
                 "data/injections/tibet_itemrots.bin",
             ],
@@ -255,6 +270,7 @@
             ],
             "injections": [
                 "data/injections/barkhang_itemrots.bin",
+                "data/injections/barkhang_pickup_meshes.bin",
             ],
         },
 
@@ -273,6 +289,7 @@
             "injections": [
                 "data/injections/catacombs_fd.bin",
                 "data/injections/catacombs_itemrots.bin",
+                "data/injections/common_pickup_meshes.bin",
             ],
         },
 
@@ -288,6 +305,7 @@
                 {"type": "level_complete"},
             ],
             "injections": [
+                "data/injections/common_pickup_meshes.bin",
                 "data/injections/palace_fd.bin",
                 "data/injections/palace_itemrots.bin",
             ],
@@ -309,6 +327,7 @@
             "injections": [
                 "data/injections/xian_fd.bin",
                 "data/injections/xian_itemrots.bin",
+                "data/injections/xian_pickup_meshes.bin",
             ],
         },
 
@@ -327,6 +346,7 @@
             "injections": [
                 "data/injections/floating_fd.bin",
                 "data/injections/floating_itemrots.bin",
+                "data/injections/floating_pickup_meshes.bin",
             ],
         },
 
@@ -342,6 +362,9 @@
                 {"type": "play_fmv", "fmv_id": 7},
                 {"type": "level_complete"},
             ],
+            "injections": [
+                "data/injections/common_pickup_meshes.bin",
+            ],
         },
 
         // 18. Home Sweet Home
@@ -385,6 +408,9 @@
                 {"type": "loop_game"},
                 {"type": "level_complete"},
             ],
+            "injections": [
+                "data/injections/common_pickup_meshes.bin",
+            ],
         },
 
         // Demo 2: Wreck of the Maria Doria
@@ -399,7 +425,9 @@
             ],
             "injections": [
                 "data/injections/wreck_fd.bin",
+                "data/injections/wreck_goon_sfx.bin",
                 "data/injections/wreck_itemrots.bin",
+                "data/injections/wreck_pickup_meshes.bin",
             ],
         },
 
@@ -414,6 +442,7 @@
                 {"type": "level_complete"},
             ],
             "injections": [
+                "data/injections/common_pickup_meshes.bin",
                 "data/injections/tibet_fd.bin",
                 "data/injections/tibet_itemrots.bin",
             ],

docs/tr2/CHANGELOG.md

@@ -19,6 +19,7 @@
 - fixed Lara getting stuck in a T-pose after jumping/falling and then dying before reaching fast fall speed (#2575)
 - fixed missing enemy sound effects in the underwater levels (#2293)
 - fixed seaweed collision in Living Quarters preventing Lara from climbing out of the water in room 15 (#2197)
+- fixed the scale and rotation of several pickup models, such as the offshore key cards and Barkhang prayer wheels (#1832, #1894)
 - fixed a rare issue whereby Lara would be unable to move after disposing a flare (#2545, regression from 0.9)
 - fixed flare pickups only adding one flare to Lara's inventory rather than six (#2551, regression from 0.9)
 - fixed several issues with pushblocks (#2036/#2193)

docs/tr2/README.md

@@ -93,6 +93,20 @@ game with new enhancements and features.
     - fixed being unable to stack multiple pushblocks over multiple rooms
     - fixed falling pushblocks using the enemy grunt sound effect
 - fixed seaweed collision in Living Quarters preventing Lara from climbing out of the water in room 15
+- fixed the scale and rotation of several pickup models:
+    - increased auto pistol ammo size
+    - increased M16 ammo size
+    - increased grenade size
+    - reduced Offshore Rig and Diving Area key card sizes, and fixed inventory rotation
+    - reduced Wreck of the Maria Doria circuit breaker size
+    - increased Wreck of the Maria Doria rest room key size
+    - increased Living Quarters theatre key size
+    - increased The Deck cabin key size
+    - reduced Barkhang Monastery prayer wheel size
+    - increased Barkhang Monastery gemstone size
+    - increased Barkhang Monastery rooftops key size
+    - increased Temple of Xian dragon seal size, and fixed inventory rotation
+    - fixed Floating Islands mystic plaque inventory rotation
 - improved the animation of Lara's braid
 
 #### Cheats