#316 Detonator Animation

Ensures that the detonator animation remains in Bartoli's when enemies that have their own LaraMiscAnim dependency are imported.
LostArtefacts · Mar 26, 2022 · 1131c1f · 1131c1f
1 parent 60f63b5
commit 1131c1f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/TRLevelReader/Model/TR2/Enums/TR2Entities.cs b/TRLevelReader/Model/TR2/Enums/TR2Entities.cs
@@ -291,6 +291,7 @@ public enum TR2Entities
         LaraMiscAnim_H_Xian,       // Death-by-Guard, inspecting dagger
         LaraMiscAnim_H_Wall,       // Death-by-Barney
         LaraMiscAnim_H_HSH,        // Inspecting dagger at home
+        LaraMiscAnim_H_Venice,     // Bartoli's detonator
 
         // Split Lara's outfits and weapon animations
         LaraSun = 3000,

diff --git a/TRModelTransporter/Data/TR2DefaultDataProvider.cs b/TRModelTransporter/Data/TR2DefaultDataProvider.cs
@@ -223,7 +223,7 @@ public IEnumerable<int> GetIgnorableTextureIndices(TR2Entities entity)
 
             [TR2Entities.LaraMiscAnim_H] = new List<TR2Entities>
             {
-                TR2Entities.LaraMiscAnim_H_Wall, TR2Entities.LaraMiscAnim_H_Unwater, TR2Entities.LaraMiscAnim_H_Ice, TR2Entities.LaraMiscAnim_H_Xian, TR2Entities.LaraMiscAnim_H_HSH
+                TR2Entities.LaraMiscAnim_H_Wall, TR2Entities.LaraMiscAnim_H_Unwater, TR2Entities.LaraMiscAnim_H_Ice, TR2Entities.LaraMiscAnim_H_Xian, TR2Entities.LaraMiscAnim_H_HSH, TR2Entities.LaraMiscAnim_H_Venice
             },
 
             [TR2Entities.TigerOrSnowLeopard] = new List<TR2Entities>

diff --git a/TRRandomizerCore/Utilities/TR2EnemyUtilities.cs b/TRRandomizerCore/Utilities/TR2EnemyUtilities.cs
@@ -493,6 +493,9 @@ public static Dictionary<TR2Entities, TR2Entities> GetAliasPriority(string lvlNa
             {
                 switch (lvlName)
                 {
+                    case TR2LevelNames.BARTOLI:
+                        priorities[TR2Entities.LaraMiscAnim_H] = TR2Entities.LaraMiscAnim_H_Venice;
+                        break;
                     case TR2LevelNames.RIG:
                     case TR2LevelNames.DA:
                     case TR2LevelNames.DORIA: